Changeset 5282

Timestamp:

04/17/2007 11:00:35 PM (19 years ago)

Author:

ryan

Message:

Revert [5275] - [5277]. Fix it later. see #4153

File:

• trunk/wp-includes/link-template.php (modified) (1 diff)

trunk/wp-includes/link-template.php

@@ -275 +275 @@
 }
 
-function get_edit_post_link( $link = 'Edit This' ) {
+function edit_post_link($link = 'Edit This', $before = '', $after = '') {
         global $post;
-        
-        if ( is_attachment() ) {
+
+        if ( is_attachment() )
                 return;
-        }
-        
-        if ( $post->post_type == 'page' ) {
-                if ( !current_user_can( 'edit_page', $post->ID ) ) {
+
+        if( $post->post_type == 'page' ) {
+                if ( ! current_user_can('edit_page', $post->ID) )
                         return;
-                }
                 $file = 'page';
         } else {
-                if ( !current_user_can( 'edit_post', $post->ID ) ) {
+                if ( ! current_user_can('edit_post', $post->ID) )
                         return;
-                }
                 $file = 'post';
         }
-        
-        return '<a href="' . get_option( 'wpurl' ) . '/wp-admin/' . $file . '.php?action=edit&amp;post=' . $post->ID . '>' . $link . '</a>' . $after;
-}
-
-function edit_post_link( $link = 'Edit This', $before = '', $after = '' ) {
-        echo $before . get_edit_post_link( $link ) . $after;
-}
-
-function get_edit_comment_link( $link = 'Edit This' ) {
+
+        $location = get_option('siteurl') . "/wp-admin/{$file}.php?action=edit&amp;post=$post->ID";
+        echo $before . "<a href=\"$location\">$link</a>" . $after;
+}
+
+function edit_comment_link($link = 'Edit This', $before = '', $after = '') {
         global $post, $comment;
-        
-        if ( $post->post_type == 'page' ) {
-                if ( !current_user_can( 'edit_page', $post->ID ) ) {
+
+        if( $post->post_type == 'page' ){
+                if ( ! current_user_can('edit_page', $post->ID) )
                         return;
-                }
-        } else {
-                if ( !current_user_can( 'edit_post', $post->ID ) ) {
+        } else {
+                if ( ! current_user_can('edit_post', $post->ID) )
                         return;
-                }
-        }
-        
-        return '<a href="' . get_option( 'siteurl' ) . '/wp-admin/comment.php?action=editcomment&amp;c=' . $comment->comment_ID . '">' . $link . '</a>';
-}
-
-function edit_comment_link( $link = 'Edit This', $before = '', $after = '' ) {
-        echo $before . get_edit_comment_link( $link ) . $after;
+        }
+
+        $location = get_option('siteurl') . "/wp-admin/comment.php?action=editcomment&amp;c=$comment->comment_ID";
+        echo $before . "<a href='$location'>$link</a>" . $after;
 }