Changeset 8620 for branches/crazyhorse/wp-includes/comment-template.php

Timestamp:

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

Author:

ryan

Message:

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

File:

• branches/crazyhorse/wp-includes/comment-template.php (modified) (2 diffs)

branches/crazyhorse/wp-includes/comment-template.php

@@ -321 +321 @@
  * @uses $comment
  *
+ * @param object|string|int $comment Comment to retrieve.
  * @return string The permalink to the current comment
  */
-function get_comment_link() {
-    global $comment;
+function get_comment_link($comment = null) {
+    $comment = get_comment($comment);
     return get_permalink( $comment->comment_post_ID ) . '#comment-' . $comment->comment_ID;
 }
@@ -665 +666 @@
 
     define('COMMENTS_TEMPLATE', true);
-    $include = apply_filters('comments_template', TEMPLATEPATH . $file );
+
+    $include = apply_filters('comments_template', STYLESHEETPATH . $file );
     if ( file_exists( $include ) )
         require( $include );
+    elseif ( file_exists( TEMPLATEPATH . $file ) )
+        require( TEMPLATEPATH .  $file );
     else
-        require( WP_CONTENT_DIR . '/themes/default/comments.php');
+        require( get_theme_root() . '/default/comments.php');
 }