Index: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/comments-edit.php
===================================================================
--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/comments-edit.php (nonexistent)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/comments-edit.php (working copy)
@@ -0,0 +1,58 @@
+comment_parent ? true : false;
+ $post = get_queried_object();
+ $post_id = get_queried_object_id();
+ $post_url = get_permalink( $post_id );
+ $post_title = single_post_title( '', false );
+ $post_link = "{$post_title} ";
+ $note_link = "note {$comment_id} ";
+
+ add_filter( 'breadcrumb_trail_items', function($items) use ( $post_link, $note_link ) {
+ $items[] = $post_link;
+ $items[] = $note_link;
+ return $items;
+ } );
+?>
+
+ >
+
+ false ) ); ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
''
- . sprintf(
- /* translators: 1: user profile link, 2: accessibility text, 3: user name, 4: logout URL */
- __( 'Logged in as %3$s . Log out? ' ),
- 'https://profiles.wordpress.org/' . esc_attr( wp_get_current_user()->user_nicename ),
- /* translators: %s: user name */
- esc_attr( sprintf( __( 'Logged in as %s. Edit your profile.' ), $user_identity ) ),
- $user_identity,
- wp_logout_url( apply_filters( 'the_permalink', get_permalink() ) )
- )
- . '
'
- . __( 'Notes should supplement code reference entries, for example examples, tips, explanations, use-cases, and best practices.', 'wporg' )
- . ' '
- . __( 'Feedback can be to report errors or omissions with the documentation on this page. Such feedback will not be publicly posted.', 'wporg' )
- . ' '
- /* translators: 1: php button, 2: js button, 3: inline code button */
- . sprintf(
- __( 'You can enter text and code. Use the %1$s, %2$s, or %3$s buttons to wrap code snippets.', 'wporg' ),
- 'php ',
- 'js ',
- '' . __( 'inline code', 'wporg' ) . ' '
- )
- . ' '
- . __( 'Submission Notes:', 'wporg' )
- . '
'
- . __( 'This form is not for support requests, discussions, spam, bug reports, complaints, or self-promotion. Entries of this nature will be deleted.', 'wporg' )
- . ' '
- . __( 'In the editing area the Tab key enters a tab character. To move below this area by pressing Tab, press the Esc key followed by the Tab key. In some cases the Esc key will need to be pressed twice before the Tab key will allow you to continue.', 'wporg' )
- . ' '
- . sprintf(
- /* translators: 1: GFDL link */
- __( 'NOTE: All contributions are licensed under %s and are moderated before appearing on the site.', 'wporg' ),
- 'GFDL '
- )
- . ' ' . sprintf(
- __( 'You must log in before being able to contribute a note or feedback.', 'wporg' ),
- 'https://login.wordpress.org/?redirect_to=' . urlencode( get_comments_link() )
- ) . '
',
- 'title_reply' => '', //'Add Example'
- 'title_reply_to' => '',
- );
-
- if ( class_exists( 'DevHub_Note_Preview' ) ) {
- $args['comment_notes_after'] = DevHub_Note_Preview::comment_preview() . $args['comment_notes_after'];
- $args['class_form'] = 'comment-form tab-container';
- }
-
- if ( class_exists( 'DevHub_User_Submitted_Content' ) ) {
- $args['comment_field'] = DevHub_User_Submitted_Content::wp_editor_comments();
- }
-
// Insert comment form if feedback form is not already used.
- if ( empty( $feedback_editor ) ) {
+ if ( empty( $feedback_editor ) && class_exists( 'DevHub_User_Submitted_Content' ) ) {
+ $args = \DevHub_User_Submitted_Content::comment_form_args();
comment_form( $args );
}
?>
Index: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/functions.php
===================================================================
--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/functions.php (revision 7107)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/functions.php (working copy)
@@ -56,6 +56,11 @@
require __DIR__ . '/inc/user-content-voting.php';
/**
+ * Editing for user-submitted content.
+ */
+require __DIR__ . '/inc/user-content-edit.php';
+
+/**
* CLI commands custom post type and importer.
*/
require __DIR__ . '/inc/cli.php';
Index: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/template-tags.php
===================================================================
--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/template-tags.php (revision 7107)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/template-tags.php (working copy)
@@ -202,7 +202,6 @@
// Feedback links to log in, add feedback or show feedback.
echo "\n";
if ( $can_user_post_note ) {
- echo "EEE";
$feedback_link = trailingslashit( get_permalink() ) . "?replytocom={$comment_id}#feedback-editor-{$comment_id}";
$display = '';
$aria = '';
@@ -245,6 +244,7 @@
$is_voting = class_exists( 'DevHub_User_Contributed_Notes_Voting' );
$count = $is_voting ? (int) DevHub_User_Contributed_Notes_Voting::count_votes( $comment->comment_ID, 'difference' ) : 0;
$curr_user_note = $is_voting ? (bool) DevHub_User_Contributed_Notes_Voting::is_current_user_note( $comment->comment_ID ) : false;
+ $user_can_edit = current_user_can( 'edit_comment', $comment->comment_ID );
// Classes
$comment_class = array();
@@ -311,6 +311,11 @@
— ', '' ); ?>
+ comment_ID ) ) : ?>
+ —
+
—
@@ -329,9 +334,12 @@
$text .= ' ';
$text .= '' . $date . ' ';
- if ( current_user_can( 'edit_comment', $comment->comment_ID ) ) {
+ if ( $user_can_edit ) {
$text .= ' — ';
+ } elseif ( \DevHub\can_user_edit_note( $comment->comment_ID ) ) {
+ $text .= ' — ';
}
if ( ! $approved ) {
@@ -1397,6 +1405,36 @@
}
/**
+ * Indicates if the current user can edit a user contibuted note.
+ *
+ * A user can edit a note if the note is from a parsed post type, and
+ * the note is from the current user and it's not yet approved.
+ * Or if the user has the 'edit_comment' capability.
+ *
+ * @param integer $note_id Note ID.
+ * @return bool True if the current user can edit the note.
+ */
+ function can_user_edit_note( $note_id = 0 ) {
+ $user = get_current_user_id();
+ $note = get_comment( $note_id );
+ if ( ! $user || ! $note ) {
+ return false;
+ }
+
+ $post_id = isset( $note->comment_post_ID ) ? (int) $note->comment_post_ID : 0;
+ $is_note_author = isset( $note->user_id ) && ( (int) $note->user_id === $user );
+ $is_approved = isset( $note->comment_approved ) && ( 0 < (int) $note->comment_approved );
+ $can_edit_notes = isset( $note->comment_ID ) && current_user_can( 'edit_comment', $note->comment_ID );
+ $is_parsed_type = is_parsed_post_type( get_post_type( $post_id ) );
+
+ if ( $is_parsed_type && ( $can_edit_notes || ( $is_note_author && ! $is_approved ) ) ) {
+ return true;
+ }
+
+ return false;
+ }
+
+ /**
* Gets the summary.
*
* The summary (aka short description) is stored in the 'post_excerpt' field.
Index: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/user-content-edit.php
===================================================================
--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/user-content-edit.php (nonexistent)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/user-content-edit.php (working copy)
@@ -0,0 +1,160 @@
+is_main_query() && $query->get( 'feedback_id' ) ) ) {
+ // Not a query for editing a note.
+ return;
+ }
+
+ $comment_id = $query->get( 'feedback_id' );
+
+ if ( DevHub\can_user_edit_note( $comment_id ) ) {
+ $comment = get_comment( $comment_id );
+ if ( isset( $comment->comment_post_ID ) ) {
+ $query->is_singular = true;
+ $query->is_single = true;
+ $query->set( 'post_type', get_post_type( $comment->comment_post_ID ) );
+ $query->set( 'p', $comment->comment_post_ID );
+ }
+ } else {
+ $query->set_404();
+ }
+ }
+
+} // DevHub_User_Content_Edit
+
+DevHub_User_Content_Edit::init();
Index: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/user-content.php
===================================================================
--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/user-content.php (revision 7107)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-developer/inc/user-content.php (working copy)
@@ -50,7 +50,7 @@
remove_filter( 'comment_text', 'capital_P_dangit', 31 );
// Enable shortcodes for comments
- add_filter( 'comment_text', 'do_shortcode');
+ add_filter( 'comment_text', 'do_shortcode' );
// Customize allowed tags
add_filter( 'wp_kses_allowed_html', array( __CLASS__, 'wp_kses_allowed_html' ), 10, 2 );
@@ -67,6 +67,8 @@
// Allowed HTML for an edited child comment (There is no decent hook to filter child comments only)
add_action( 'edit_comment', array( __CLASS__, 'comment_edit_allowed_html' ) );
+ // Adds hidden fields for editing to a comment form
+ add_filter( 'comment_form_submit_field', array( __CLASS__, 'add_hidden_fields' ), 10, 2 );
}
/**
@@ -167,9 +169,9 @@
wp_enqueue_script( 'wporg-developer-user-notes', get_template_directory_uri() . '/js/user-notes.js', array( 'jquery', 'quicktags' ), '20180323', true );
wp_enqueue_script( 'wporg-developer-user-notes-feedback', get_template_directory_uri() . '/js/user-notes-feedback.js', array( 'jquery', 'quicktags' ), '20180323', true );
wp_localize_script( 'wporg-developer-user-notes-feedback', 'wporg_note_feedback', array(
- 'show' => __( 'Show Feedback', 'wporg' ),
- 'hide' => __( 'Hide Feedback', 'wporg' ),
- ) );
+ 'show' => __( 'Show Feedback', 'wporg' ),
+ 'hide' => __( 'Hide Feedback', 'wporg' ),
+ ) );
}
}
@@ -176,7 +178,7 @@
/**
* Sets the default language for SyntaxHighlighter shortcode.
*
- * @param array $atts Shortcode attributes.
+ * @param array $atts Shortcode attributes.
* @return array
*/
public static function syntaxhighlighter_shortcodeatts( $atts ) {
@@ -187,7 +189,7 @@
/**
* Subverts capital_P_dangit for SyntaxHighlighter shortcode.
*
- * @param string $code
+ * @param string $code
* @return string
*/
public static function syntaxhighlighter_precode( $code ) {
@@ -195,40 +197,124 @@
}
/**
+ * Add hidden fields to the comment form if the context is 'edit'
+ *
+ * @param string $submit_field HTML string with the submit button fields.
+ * @param array $args Arguments for the comment form.
+ * @return HTML string with the submit button fields.
+ */
+ public static function add_hidden_fields( $submit_field, $args ) {
+ $context = isset( $args['context'] ) ? $args['context'] : '';
+ $comment = isset( $args['comment_edit'] ) ? $args['comment_edit'] : false;
+ if ( ! ( $comment && ( 'edit' === $context ) ) ) {
+ return $submit_field;
+ }
+
+ $comment_id = isset( $comment->comment_ID ) ? $comment->comment_ID : 0;
+
+ return $submit_field . self::get_edit_fields( $comment_id, $instance = 0 );
+ }
+
+ /**
+ * Get the comment form arguments by context.
+ *
+ * @param WP_Comment|false $comment Comment object or false. Default false.
+ * @param string $context Context of arguments. Accepts 'edit' or empty string.
+ * @return array Array with comment form arguments.
+ */
+ public static function comment_form_args( $comment = false, $context = '' ) {
+ $label = _x( 'Add Note or Feedback', 'noun', 'wporg' );
+ if ( 'edit' === $context ) {
+ $label = _x( 'Edit Note', 'noun', 'wporg' );
+ }
+
+ $args = array(
+ 'logged_in_as' => ''
+ . sprintf(
+ /* translators: 1: user profile link, 2: accessibility text, 3: user name, 4: logout URL */
+ __( 'Logged in as %3$s . Log out? ' ),
+ 'https://profiles.wordpress.org/' . esc_attr( wp_get_current_user()->user_nicename ),
+ /* translators: %s: user name */
+ esc_attr( sprintf( __( 'Logged in as %s. Edit your profile.' ), $user_identity ) ),
+ $user_identity,
+ wp_logout_url( apply_filters( 'the_permalink', get_permalink() ) )
+ )
+ . '
'
+ . __( 'Notes should supplement code reference entries, for example examples, tips, explanations, use-cases, and best practices.', 'wporg' )
+ . ' '
+ . __( 'Feedback can be to report errors or omissions with the documentation on this page. Such feedback will not be publicly posted.', 'wporg' )
+ . ' '
+ /* translators: 1: php button, 2: js button, 3: inline code button */
+ . sprintf(
+ __( 'You can enter text and code. Use the %1$s, %2$s, or %3$s buttons to wrap code snippets.', 'wporg' ),
+ 'php ',
+ 'js ',
+ '' . __( 'inline code', 'wporg' ) . ' '
+ )
+ . ' ' . __( 'Submission Notes:', 'wporg' ) . '
' . self::get_editor_rules(),
+ 'label_submit' => $label,
+ 'cancel_reply_link' => '',
+ 'must_log_in' => '' . sprintf(
+ __( 'You must log in before being able to contribute a note or feedback.', 'wporg' ),
+ 'https://login.wordpress.org/?redirect_to=' . urlencode( get_comments_link() )
+ ) . '
',
+ 'title_reply' => '', //'Add Example'
+ 'title_reply_to' => '',
+ );
+
+ if ( class_exists( 'DevHub_Note_Preview' ) ) {
+ $args['comment_notes_after'] = DevHub_Note_Preview::comment_preview() . $args['comment_notes_after'];
+ $args['class_form'] = "comment-form tab-container";
+ }
+
+ $args['comment_field'] = self::wp_editor_comments( $label, $comment );
+ $args['context'] = $context;
+ $args['comment_edit'] = $comment;
+
+ if ( $comment && ( 'edit' === $context ) ) {
+ $comment_id = isset( $comment->comment_ID ) ? $comment->comment_ID : 0;
+ $post_id = isset( $comment->comment_post_ID ) ? $comment->comment_post_ID : 0;
+
+ $args['action'] = get_permalink( $post_id ) . '#comment-' . $comment_id;
+ }
+
+ return $args;
+ }
+
+ /**
* Capture an {@see wp_editor()} instance as the 'User Contributed Notes' comment form.
*
* Uses output buffering to capture the editor instance for use with the {@see comments_form()}.
*
+ * @param string $label Label used for the editor.
+ * @param WP_Comment|false $comment Comment object or false. Default false.
* @return string HTML output for the wp_editor-ized comment form.
*/
- public static function wp_editor_comments() {
+ public static function wp_editor_comments( $label, $comment = false ) {
+ $content = isset( $comment->comment_content ) ? $comment->comment_content : '';
+
ob_start();
- echo '' . _x( 'Add Note or Feedback', 'noun', 'wporg' ) . ' ' . $label . ' ';
+ echo "';
}
- $style = '';
-
echo '';
return ob_get_clean();
}
@@ -238,9 +324,12 @@
*
* Uses output buffering to capture the editor instance.
*
+ * @param WP_Comment|false $comment Comment object or false. Default false.
+ * @param string $display Display the editor. Default 'show'.
+ * @param bool $edit True if the editor used for editing a note. Default false.
* @return string HTML output for the wp_editor-ized feedback form.
*/
- public static function wp_editor_feedback( $comment, $display = 'show', $content = '' ) {
+ public static function wp_editor_feedback( $comment, $display = 'show', $edit = false ) {
if ( ! ( isset( $comment->comment_ID ) && absint( $comment->comment_ID ) ) ) {
return '';
@@ -252,14 +341,20 @@
$instance++;
$display = ( 'hide' === $display ) ? ' style="display: none;"' : '';
+ $parent = $comment_id;
+ $action = site_url( '/wp-comments-post.php' );
+ $content = '';
$title = __( 'Add feedback to this note', 'wporg' );
$form_type = '';
$button_text = __( 'Add Feedback', 'wporg' );
-
- if ( $content ) {
+ $post_id = isset( $comment->comment_post_ID ) ? $comment->comment_post_ID : get_the_ID();
+ if ( $edit ) {
+ $parent = isset( $comment->comment_parent ) ? $comment->comment_parent : 0;
+ $content = isset( $comment->comment_content ) ? $comment->comment_content : '';
$title = __( 'Edit feedback', 'wporg' );
$form_type = '-edit';
- $button_text = __( 'Edit Feedback', 'wporg' );
+ $button_text = __( 'Edit Note', 'wporg' );
+ $action = get_permalink( $post_id ) . '#comment-' . $comment_id;
}
$allowed_tags = '';
@@ -269,29 +364,99 @@
ob_start();
echo "\n";
return ob_get_clean();
}
+ /**
+ * Get the rules list for the comment form.
+ *
+ * @param string $context Accepts 'feedback' or empty sring
+ * @return string Editor rules.
+ */
+ function get_editor_rules( $context = '' ) {
+ if ( 'feedback' === $context ) {
+ return ''
+ . __( 'This form is not for support requests, spam, bug reports, complaints, or self-promotion. Entries of this nature will be deleted.', 'wporg' )
+ . ' '
+
+ . sprintf(
+ /* translators: 1: GFDL link */
+ __( 'NOTE: All contributions are licensed under %s and are moderated before appearing on the site.', 'wporg' ),
+ 'GFDL '
+ )
+ . ' '
+ . __( 'This form is not for support requests, discussions, spam, bug reports, complaints, or self-promotion. Entries of this nature will be deleted.', 'wporg' )
+ . ' '
+ . __( 'In the editing area the Tab key enters a tab character. To move below this area by pressing Tab, press the Esc key followed by the Tab key. In some cases the Esc key will need to be pressed twice before the Tab key will allow you to continue.', 'wporg' )
+ . ' '
+ . sprintf(
+ /* translators: 1: GFDL link */
+ __( 'NOTE: All contributions are licensed under %s and are moderated before appearing on the site.', 'wporg' ),
+ 'GFDL '
+ )
+ . '