Log in with username/password: lyceum/lyceum

Changeset 614

Show
Ignore:
Timestamp:
03/28/06 17:06:36 (2 years ago)
Author:
jjb
Message:

cleaning up some cruft

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/src/lib/wp-includes/pluggable-functions.php

    r547 r614  
    399399 
    400400   $notify_message  = sprintf( __('A new comment on the post #%1$s "%2$s" is waiting for your approval'), $post->ID, $post->post_title ) . "\r\n"; 
    401    $notify_message .= get_permalink($comment->comment_post_ID, true) . "\r\n\r\n"; 
     401   $notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n"; 
    402402   $notify_message .= sprintf( __('Author : %1$s (IP: %2$s , %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n"; 
    403403   $notify_message .= sprintf( __('E-mail : %s'), $comment->comment_author_email ) . "\r\n"; 
  • trunk/src/lib/wp-includes/template-functions-links.php

    r613 r614  
    2323} 
    2424 
    25 function get_permalink($id = 0, $email=false) { 
    26    global $blog, $blogdata; 
     25function get_permalink($id = 0) { 
    2726   $rewritecode = array( 
    2827      '%year%', 
     
    7574      return apply_filters('post_link', get_settings('home') .str_replace($rewritecode, $rewritereplace, $permalink), $post); 
    7675   } else { // if they're not using the fancy permalink option 
    77       $ampersand = $email?'&':'&'; 
    78       $permalink = get_settings('home') . "?b=$blog".$ampersand."p=" . $post->ID; 
     76      $permalink = get_settings('home') . "?p=" . $post->ID; 
    7977      return apply_filters('post_link', $permalink, $post); 
    8078   } 
     
    8280 
    8381function get_page_link($id = false) { 
    84    global $post, $wp_rewrite, $blog
     82   global $post, $wp_rewrite
    8583 
    8684   if (! $id) { 
     
    9593      $link = get_settings('home') . "/$link/"; 
    9694   } else { 
    97       $link = get_settings('home') . "/?b=$blogdata->slug&page_id=$id"; 
     95      $link = get_settings('home') . "/?page_id=$id"; 
    9896   } 
    9997 
     
    102100 
    103101function get_attachment_link($id = false) { 
    104    global $post, $wp_rewrite, $blog
     102   global $post, $wp_rewrite
    105103 
    106104   $link = false; 
     
    119117 
    120118   if (! $link ) { 
    121       $link = get_bloginfo('home') . "/?b=$blogdata->slug&attachment_id=$id"; 
     119      $link = get_bloginfo('home') . "/?attachment_id=$id"; 
    122120   } 
    123121 
     
    169167 
    170168function get_feed_link($feed='rss2') { 
    171    global $wp_rewrite, $blog
     169   global $wp_rewrite
    172170   $do_perma = 0; 
    173171   $feed_url = get_settings('siteurl'); 
     
    191189         $feed = str_replace('comments_', 'comments-', $feed); 
    192190 
    193       $output = get_settings('home') . "/?b=$blogdata->slug&feed={$feed}"; 
     191      $output = get_settings('home') . "/?feed={$feed}"; 
    194192   } 
    195193 
     
    198196 
    199197function edit_post_link($link = 'Edit This', $before = '', $after = '') { 
    200     global $user_ID, $post, $blog, $bloginfo
     198    global $user_ID, $post
    201199 
    202200    get_currentuserinfo(); 
     
    211209      $file = 'post'; 
    212210 
    213    $location = get_settings('siteurl') . "/$blog/admin/{$file}.php?token=".formtoken($file.'.php','edit',$post->ID)."&action=edit&post=$post->ID"; 
     211   $location = get_settings('home') . "/admin/{$file}.php?token=".formtoken($file.'.php','edit',$post->ID)."&action=edit&post=$post->ID"; 
    214212   echo $before . "<a href=\"$location\">$link</a>" . $after; 
    215213} 
    216214 
    217215function edit_comment_link($link = 'Edit This', $before = '', $after = '') { 
    218     global $user_ID, $post, $comment, $blog
     216    global $user_ID, $post, $comment
    219217 
    220218    get_currentuserinfo(); 
  • trunk/src/lyceum/wp-comments-post.php

    r543 r614  
    6363   setcookie('comment_author_url_' . COOKIEHASH, stripslashes($comment_author_url), time() + 30000000, COOKIEPATH, COOKIE_DOMAIN); 
    6464endif; 
    65  
     65trace('get_permalink( $comment_post_ID )', get_permalink( $comment_post_ID )); 
     66trace('empty( $_POST[\'redirect_to\'] )', empty( $_POST['redirect_to'] )); 
    6667$location = ( empty( $_POST['redirect_to'] ) ) ? get_permalink( $comment_post_ID ) : $_POST['redirect_to'];  
    6768 
Log in with username/password: lyceum/lyceum