Wordpress 2.8.4-scripts

[autoinstalls/wordpress.git] / wp-includes / link-template.php

diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php
index fb111376169b57a0e8d79bb0d592350293349f11..96453aabcb5febc63a87b36d075416e129d78091 100644 (file)
--- a/wp-includes/link-template.php
+++ b/wp-includes/link-template.php
@@ -768,8 +768,7 @@ function get_edit_comment_link( $comment_id = 0 ) {
 function edit_comment_link( $link = 'Edit This', $before = '', $after = '' ) {
        global $comment, $post;
 
-       if ( $post->post_type == 'attachment' ) {
-       } elseif ( $post->post_type == 'page' ) {
+       if ( $post->post_type == 'page' ) {
                if ( !current_user_can( 'edit_page', $post->ID ) )
                        return;
        } else {
@@ -1693,7 +1692,7 @@ function site_url($path = '', $scheme = null) {
        // should the list of allowed schemes be maintained elsewhere?
        $orig_scheme = $scheme;
        if ( !in_array($scheme, array('http', 'https')) ) {
-               if ( ('login_post' == $scheme) && ( force_ssl_login() || force_ssl_admin() ) )
+               if ( ( 'login_post' == $scheme || 'rpc' == $scheme ) && ( force_ssl_login() || force_ssl_admin() ) )
                        $scheme = 'https';
                elseif ( ('login' == $scheme) && ( force_ssl_admin() ) )
                        $scheme = 'https';