From bf7ffa37be106a4ed70836b32bfc5b79301d700d Mon Sep 17 00:00:00 2001
From: Denver Prophit Jr <denver@denverprophit.us>
Date: Fri, 17 Nov 2017 07:15:07 -0500
Subject: [PATCH 1/6] Updates CPT post type to have featured image

Updates issue /designwall/dw-question-answer/#213 which I believe will enable featured image ability when Question is edited and saved. I'm having to go backwards into my hacks. I believe I also modified a language define or two.
---
 inc/Posts/Question.php | 210 ++++++++++++++++++++++-------------------
 1 file changed, 115 insertions(+), 95 deletions(-)

diff --git a/inc/Posts/Question.php b/inc/Posts/Question.php
index 12fc19dd..e582d65d 100644
--- a/inc/Posts/Question.php
+++ b/inc/Posts/Question.php
@@ -8,42 +8,42 @@ function dwqa_related_question( $question_id = false, $number = 5, $echo = true
 		$question_id = get_the_ID();
 	}
 	$tag_in = $cat_in = array();
-	$tags = wp_get_post_terms( $question_id, 'dwqa-question_tag' );
-	if ( ! empty($tags) ) {
+	$tags   = wp_get_post_terms( $question_id, 'dwqa-question_tag' );
+	if ( ! empty( $tags ) ) {
 		foreach ( $tags as $tag ) {
 			$tag_in[] = $tag->term_id;
 		}
 	}
 
 	$category = wp_get_post_terms( $question_id, 'dwqa-question_category' );
-	if ( ! empty($category) ) {
+	if ( ! empty( $category ) ) {
 		foreach ( $category as $cat ) {
 			$cat_in[] = $cat->term_id;
 		}
 	}
 	$args = array(
-		'orderby'       => 'rand',
-		'post__not_in'  => array($question_id),
-		'showposts'     => $number,
+		'orderby'             => 'rand',
+		'post__not_in'        => array( $question_id ),
+		'showposts'           => $number,
 		'ignore_sticky_posts' => 1,
-		'post_type'     => 'dwqa-question',
+		'post_type'           => 'dwqa-question',
 	);
 
 	$args['tax_query']['relation'] = 'OR';
 	if ( ! empty( $cat_in ) ) {
 		$args['tax_query'][] = array(
-			'taxonomy'  => 'dwqa-question_category',
-			'field'     => 'id',
-			'terms'     => $cat_in,
-			'operator'  => 'IN',
+			'taxonomy' => 'dwqa-question_category',
+			'field'    => 'id',
+			'terms'    => $cat_in,
+			'operator' => 'IN',
 		);
 	}
 	if ( ! empty( $tag_in ) ) {
 		$args['tax_query'][] = array(
-			'taxonomy'  => 'dwqa-question_tag',
-			'field'     => 'id',
-			'terms'     => $tag_in,
-			'operator'  => 'IN',
+			'taxonomy' => 'dwqa-question_tag',
+			'field'    => 'id',
+			'terms'    => $tag_in,
+			'operator' => 'IN',
 		);
 	}
 
@@ -52,8 +52,9 @@ function dwqa_related_question( $question_id = false, $number = 5, $echo = true
 	if ( $related_questions->have_posts() ) {
 		if ( $echo ) {
 			echo '<ul>';
-			while ( $related_questions->have_posts() ) { $related_questions->the_post();
-				echo '<li><a href="'.get_permalink().'" class="question-title">'.get_the_title().'</a> '.__( 'asked by', 'dwqa' ).' ';
+			while ( $related_questions->have_posts() ) {
+				$related_questions->the_post();
+				echo '<li><a href="' . get_permalink() . '" class="question-title">' . get_the_title() . '</a> ' . __( 'asked by', 'dwqa' ) . ' ';
 				the_author_posts_link();
 				echo '</li>';
 			}
@@ -62,12 +63,15 @@ function dwqa_related_question( $question_id = false, $number = 5, $echo = true
 	}
 	$posts = $related_questions->posts;
 	wp_reset_postdata();
+
 	return $posts;
 }
 
 /**
  * Count number of views for a questions
+ *
  * @param  int $question_id Question Post ID
+ *
  * @return int Number of views
  */
 function dwqa_question_views_count( $question_id = null ) {
@@ -92,15 +96,15 @@ class DWQA_Posts_Question extends DWQA_Posts_Base {
 	public function __construct() {
 		global $dwqa_general_settings;
 
-		if ( !$dwqa_general_settings ) {
+		if ( ! $dwqa_general_settings ) {
 			$dwqa_general_settings = get_option( 'dwqa_options' );
 		}
 		$slug = isset( $dwqa_general_settings['question-rewrite'] ) ? $dwqa_general_settings['question-rewrite'] : 'question';
 		parent::__construct( 'dwqa-question', array(
-			'plural' => __( 'Questions', 'dwqa' ),
+			'plural'   => __( 'Questions', 'dwqa' ),
 			'singular' => __( 'Question', 'dwqa' ),
-			'menu'	 => __( 'Questions', 'dwqa' ),
-			'rewrite' => array( 'slug' => $slug, 'with_front' => false ),
+			'menu'     => __( 'Questions', 'dwqa' ),
+			'rewrite'  => array( 'slug' => $slug, 'with_front' => false ),
 		) );
 
 		add_action( 'manage_dwqa-question_posts_custom_column', array( $this, 'columns_content' ), 10, 2 );
@@ -109,13 +113,13 @@ public function __construct() {
 		add_action( 'wp_head', array( $this, 'update_view' ) );
 		//Ajax Get Questions Archive link
 
-		add_action( 'wp_ajax_dwqa-get-questions-permalink', array( $this, 'get_questions_permalink') );
-		add_action( 'wp_ajax_nopriv_dwqa-get-questions-permalink', array( $this, 'get_questions_permalink') );
+		add_action( 'wp_ajax_dwqa-get-questions-permalink', array( $this, 'get_questions_permalink' ) );
+		add_action( 'wp_ajax_nopriv_dwqa-get-questions-permalink', array( $this, 'get_questions_permalink' ) );
 		//Ajax stick question
 		add_action( 'wp_ajax_dwqa-stick-question', array( $this, 'stick_question' ) );
 		add_action( 'restrict_manage_posts', array( $this, 'admin_posts_filter_restrict_manage_posts' ) );
 
-		
+
 		// Ajax Update question status
 		add_filter( 'parse_query', array( $this, 'posts_filter' ) );
 
@@ -125,9 +129,9 @@ public function __construct() {
 
 		//Prepare question content
 		add_filter( 'dwqa_prepare_question_content', array( $this, 'pre_content_kses' ), 10 );
-		add_filter( 'dwqa_prepare_question_content', array( $this, 'pre_content_filter'), 20 );
-		add_filter( 'dwqa_prepare_update_question', array( $this, 'pre_content_kses'), 10 );
-		add_filter( 'dwqa_prepare_update_question', array( $this, 'pre_content_filter'), 20 );
+		add_filter( 'dwqa_prepare_question_content', array( $this, 'pre_content_filter' ), 20 );
+		add_filter( 'dwqa_prepare_update_question', array( $this, 'pre_content_kses' ), 10 );
+		add_filter( 'dwqa_prepare_update_question', array( $this, 'pre_content_filter' ), 20 );
 	}
 
 	public function init() {
@@ -135,57 +139,58 @@ public function init() {
 	}
 
 	public function set_supports() {
-		return array( 'title', 'editor', 'comments', 'author', 'page-attributes' );
+		return array( 'title', 'editor', 'comments', 'author', 'thumbnail', 'page-attributes', 'trackbacks' );
 	}
 
 	public function set_rewrite() {
 		global $dwqa_general_settings;
-		if( isset( $dwqa_general_settings['question-rewrite'] ) ) {
+		if ( isset( $dwqa_general_settings['question-rewrite'] ) ) {
 			return array(
-				'slug' => $dwqa_general_settings['question-rewrite'],
-				'with_front' => false,
+				'slug'       => $dwqa_general_settings['question-rewrite'],
+				'with_front' => false
 			);
 		}
+
 		return array(
-			'slug' => 'question',
-			'with_front' => false,
+			'slug'       => 'question',
+			'with_front' => false
 		);
 	}
 
 	public function get_question_rewrite() {
 		global $dwqa_general_settings;
 
-		if ( !$dwqa_general_settings ) {
+		if ( ! $dwqa_general_settings ) {
 			$dwqa_general_settings = get_option( 'dwqa_options' );
 		}
 
-		return isset( $dwqa_general_settings['question-rewrite'] ) && !empty( $dwqa_general_settings['question-rewrite'] ) ? $dwqa_general_settings['question-rewrite'] : 'question';
+		return isset( $dwqa_general_settings['question-rewrite'] ) && ! empty( $dwqa_general_settings['question-rewrite'] ) ? $dwqa_general_settings['question-rewrite'] : 'question';
 	}
 
 	public function get_category_rewrite() {
 		global $dwqa_general_settings;
 
-		if ( !$dwqa_general_settings ) {
+		if ( ! $dwqa_general_settings ) {
 			$dwqa_general_settings = get_option( 'dwqa_options' );
 		}
 
-		return isset( $dwqa_general_settings['question-category-rewrite'] ) && !empty( $dwqa_general_settings['question-category-rewrite'] ) ? $dwqa_general_settings['question-category-rewrite'] : 'category';
+		return isset( $dwqa_general_settings['question-category-rewrite'] ) && ! empty( $dwqa_general_settings['question-category-rewrite'] ) ? $dwqa_general_settings['question-category-rewrite'] : 'category';
 	}
 
 	public function get_tag_rewrite() {
 		global $dwqa_general_settings;
 
-		if ( !$dwqa_general_settings ) {
+		if ( ! $dwqa_general_settings ) {
 			$dwqa_general_settings = get_option( 'dwqa_options' );
 		}
 
-		return isset( $dwqa_general_settings['question-tag-rewrite'] ) && !empty( $dwqa_general_settings['question-tag-rewrite'] ) ? $dwqa_general_settings['question-tag-rewrite'] : 'tag';
+		return isset( $dwqa_general_settings['question-tag-rewrite'] ) && ! empty( $dwqa_general_settings['question-tag-rewrite'] ) ? $dwqa_general_settings['question-tag-rewrite'] : 'tag';
 	}
 
 	public function register_taxonomy() {
 		global $dwqa_general_settings;
 
-		if ( !$dwqa_general_settings ) {
+		if ( ! $dwqa_general_settings ) {
 			$dwqa_general_settings = get_option( 'dwqa_options' );
 		}
 
@@ -222,22 +227,28 @@ public function register_taxonomy() {
 		register_taxonomy( $this->get_slug() . '_category', array( $this->get_slug() ), $args );
 
 		$labels = array(
-			'name'                       => _x( 'Question Tags', 'taxonomy general name', 'dwqa' ),
-			'singular_name'              => _x( 'Question Tag', 'taxonomy singular name', 'dwqa' ),
-			'search_items'               => __( 'Search Question Tags', 'dwqa' ),
-			'popular_items'              => __( 'Popular Question Tags', 'dwqa' ),
-			'all_items'                  => __( 'All Question Tags', 'dwqa' ),
-			'parent_item'                => null,
-			'parent_item_colon'          => null,
-			'edit_item'                  => __( 'Edit Question Tag', 'dwqa' ),
-			'update_item'                => __( 'Update Question Tag', 'dwqa' ),
-			'add_new_item'               => __( 'Add New Question Tag', 'dwqa' ),
-			'new_item_name'              => __( 'New Question Tag Name', 'dwqa' ),
-			'separate_items_with_commas' => __( 'Separate question tags with commas', 'dwqa' ),
-			'add_or_remove_items'        => __( 'Add or remove question tags', 'dwqa' ),
-			'choose_from_most_used'      => __( 'Choose from the most used question tags', 'dwqa' ),
-			'not_found'                  => __( 'No question tags found.', 'dwqa' ),
-			'menu_name'                  => __( 'Question Tags', 'dwqa' ),
+			          'name'                       => _x( 'Question Tags', 'taxonomy general name', 'dwqa' ),
+			          'singular_name'              => _x( 'Question Tag', 'taxonomy singular name', 'dwqa' ),
+			          'search_items'               => __( 'Search Question Tags', 'dwqa' ),
+			          'popular_items'              => __( 'Popular Question Tags', 'dwqa' ),
+			          'all_items'                  => __( 'All Question Tags', 'dwqa' ),
+			          'parent_item'                => null,
+			          'parent_item_colon'          => null,
+			          'edit_item'                  => __( 'Edit Question Tag', 'dwqa' ),
+			          'update_item'                => __( 'Update Question Tag', 'dwqa' ),
+			          'add_new_item'               => __( 'Add New Question Tag', 'dwqa' ),
+			          'new_item_name'              => __( 'New Question Tag Name', 'dwqa' ),
+			          'separate_items_with_commas' => __( 'Separate question tags with commas', 'dwqa' ),
+			          'add_or_remove_items'        => __( 'Add or remove question tags', 'dwqa' ),
+			          'choose_from_most_used'      => __( 'Choose from the most used question tags', 'dwqa' ),
+			          'not_found'                  => __( 'No question tags found.', 'dwqa' ),
+			          'menu_name'                  => __( 'Question Tags', 'dwqa' ),
+			          'featured_image'             => __( 'Featured Image', 'dwqa' ), . $names['singular'],
+			'set_featured_image'         => __( 'Set featured image', 'dwqa' ), . $names['singular'],
+			'remove_featured_image'      => __( 'Remove featured image', 'dwqa' ), . $names['singular'],
+			'set_featured_image'         => __( 'Set featured image', 'dwqa' ), . $names['singular'],
+			'insert_into_item'           => __( 'Insert into item', 'dwqa' ), . $names['singular'],
+			'uploaded_to_this_item'      => __( 'Uploaded to this item', 'dwqa' ), . $names['singular'],
 		);
 
 		$args = array(
@@ -249,7 +260,7 @@ public function register_taxonomy() {
 			'show_tagcloud'     => true,
 			'show_ui'           => true,
 			'query_var'         => true,
-			'rewrite'               => array( 'slug' => $tag_slug, 'with_front' => false, 'hierarchical' => true ),
+			'rewrite'           => array( 'slug' => $tag_slug, 'with_front' => false, 'hierarchical' => true ),
 			'query_var'         => true,
 			'capabilities'      => array(),
 		);
@@ -257,9 +268,9 @@ public function register_taxonomy() {
 
 		// Create default category for dwqa question type when dwqa plugin is actived
 		$cats = get_categories( array(
-			'type'                     => $this->get_slug(),
-			'hide_empty'               => 0,
-			'taxonomy'                 => $this->get_slug() . '_category',
+			'type'       => $this->get_slug(),
+			'hide_empty' => 0,
+			'taxonomy'   => $this->get_slug() . '_category',
 		) );
 
 		if ( empty( $cats ) ) {
@@ -274,8 +285,12 @@ public function register_taxonomy() {
 	public function columns_head( $defaults ) {
 		if ( isset( $_GET['post_type'] ) && esc_html( $_GET['post_type'] ) == $this->get_slug() ) {
 			$defaults['info'] = __( 'Info', 'dwqa' );
-			$defaults = dwqa_array_insert( $defaults, array( 'question-category' => 'Category', 'question-tag' => 'Tags' ), 1 );
+			$defaults         = dwqa_array_insert( $defaults, array(
+				'question-category' => 'Category',
+				'question-tag'      => 'Tags'
+			), 1 );
 		}
+
 		return $defaults;
 	}
 
@@ -284,35 +299,35 @@ public function columns_content( $column_name, $post_ID ) {
 		switch ( $column_name ) {
 			case 'info':
 				echo ucfirst( get_post_meta( $post_ID, '_dwqa_status', true ) ) . '<br>';
-				echo '<strong>'.dwqa_question_answers_count( $post_ID ) . '</strong> '.__( 'answered', 'dwqa' ) . '<br>';
-				echo '<strong>'.dwqa_vote_count( $post_ID ).'</strong> '.__( 'voted', 'dwqa' ) . '<br>';
-				echo '<strong>'.dwqa_question_views_count( $post_ID ).'</strong> '.__( 'views', 'dwqa' ) . '<br>';
+				echo '<strong>' . dwqa_question_answers_count( $post_ID ) . '</strong> ' . __( 'answered', 'dwqa' ) . '<br>';
+				echo '<strong>' . dwqa_vote_count( $post_ID ) . '</strong> ' . __( 'voted', 'dwqa' ) . '<br>';
+				echo '<strong>' . dwqa_question_views_count( $post_ID ) . '</strong> ' . __( 'views', 'dwqa' ) . '<br>';
 				break;
 			case 'question-category':
 				$terms = wp_get_post_terms( $post_ID, 'dwqa-question_category' );
-				$i = 0;
+				$i     = 0;
 				foreach ( $terms as $term ) {
 					if ( $i > 0 ) {
 						echo ', ';
 					}
-					echo '<a href="'.get_term_link( $term, 'dwqa-question_category' ).'">'.$term->name . '</a> ';
-					$i++;
+					echo '<a href="' . get_term_link( $term, 'dwqa-question_category' ) . '">' . $term->name . '</a> ';
+					$i ++;
 				}
 				break;
 			case 'question-tag':
 				$terms = wp_get_post_terms( $post_ID, 'dwqa-question_tag' );
-				$i = 0;
+				$i     = 0;
 				foreach ( $terms as $term ) {
 					if ( $i > 0 ) {
 						echo ', ';
 					}
-					echo '<a href="'.get_term_link( $term, 'dwqa-question_tag' ).'">' . $term->name . '</a> ';
-					$i++;
+					echo '<a href="' . get_term_link( $term, 'dwqa-question_tag' ) . '">' . $term->name . '</a> ';
+					$i ++;
 				}
 				break;
 		}
 	}
-	
+
 	/**
 	 * Init or increase views count for single question
 	 * @return void
@@ -324,9 +339,9 @@ public function update_view() {
 			if ( is_user_logged_in() ) {
 				global $current_user;
 				//save who see this post
-				$viewed = get_post_meta( $post->ID, '_dwqa_who_viewed', true );
-				$viewed = ! is_array( $viewed ) ? array() : $viewed;
-				$viewed[$current_user->ID] = current_time( 'timestamp' );
+				$viewed                      = get_post_meta( $post->ID, '_dwqa_who_viewed', true );
+				$viewed                      = ! is_array( $viewed ) ? array() : $viewed;
+				$viewed[ $current_user->ID ] = current_time( 'timestamp' );
 			}
 
 			if ( ( $refer && $refer != get_permalink( $post->ID ) ) || ! $refer ) {
@@ -348,12 +363,12 @@ public function get_questions_permalink() {
 		if ( isset( $_GET['params'] ) ) {
 			global $dwqa_options;
 			$params = explode( '&', sanitize_text_field( $_GET['params'] ) );
-			$args = array();
+			$args   = array();
 			if ( ! empty( $params ) ) {
 				foreach ( $params as $p ) {
 					if ( $p ) {
-						$arr = explode( '=', $p );
-						$args[$arr[0]] = $arr[1];
+						$arr             = explode( '=', $p );
+						$args[ $arr[0] ] = $arr[1];
 					}
 				}
 			}
@@ -364,7 +379,7 @@ public function get_questions_permalink() {
 
 				$question_tag_rewrite = $dwqa_options['question-tag-rewrite'];
 				$question_tag_rewrite = $question_tag_rewrite ? $question_tag_rewrite : 'question-tag';
-				if ( isset( $args[$question_tag_rewrite] ) ) {
+				if ( isset( $args[ $question_tag_rewrite ] ) ) {
 					if ( isset( $args['dwqa-question_tag'] ) ) {
 						unset( $args['dwqa-question_tag'] );
 					}
@@ -373,17 +388,17 @@ public function get_questions_permalink() {
 				$question_category_rewrite = $dwqa_options['question-category-rewrite'];
 				$question_category_rewrite = $question_category_rewrite ? $question_category_rewrite : 'question-category';
 
-				if ( isset( $args[$question_category_rewrite] ) ) {
+				if ( isset( $args[ $question_category_rewrite ] ) ) {
 					if ( isset( $args['dwqa-question_category'] ) ) {
 						unset( $args['dwqa-question_category'] );
 					}
-					$term = get_term_by( 'slug', $args[$question_category_rewrite], 'dwqa-question_category' );
-					unset( $args[$question_category_rewrite] );
+					$term = get_term_by( 'slug', $args[ $question_category_rewrite ], 'dwqa-question_category' );
+					unset( $args[ $question_category_rewrite ] );
 					$url = get_term_link( $term, 'dwqa-question_category' );
 				} else {
-					if ( isset( $args[$question_tag_rewrite] ) ) {
-						$term = get_term_by( 'slug', $args[$question_tag_rewrite], 'dwqa-question_tag' );
-						unset( $args[$question_tag_rewrite] );
+					if ( isset( $args[ $question_tag_rewrite ] ) ) {
+						$term = get_term_by( 'slug', $args[ $question_tag_rewrite ], 'dwqa-question_tag' );
+						unset( $args[ $question_tag_rewrite ] );
 						$url = get_term_link( $term, 'dwqa-question_tag' );
 					}
 				}
@@ -415,14 +430,14 @@ public function stick_question() {
 			global $current_user;
 			$sticky_questions = get_option( 'dwqa_sticky_questions', array() );
 
-			if ( ! dwqa_is_sticky( $question->ID )  ) {
+			if ( ! dwqa_is_sticky( $question->ID ) ) {
 				$sticky_questions[] = $question->ID;
 				update_option( 'dwqa_sticky_questions', $sticky_questions );
 				wp_send_json_success( array( 'code' => 'stickied' ) );
 			} else {
 				foreach ( $sticky_questions as $key => $q ) {
 					if ( $q == $question->ID ) {
-						unset( $sticky_questions[$key] );
+						unset( $sticky_questions[ $key ] );
 					}
 				}
 				update_option( 'dwqa_sticky_questions', $sticky_questions );
@@ -442,7 +457,11 @@ public function admin_posts_filter_restrict_manage_posts() {
 		//only add filter to post type you want
 		if ( 'dwqa-question' == $type ) {
 			?>
-			<label for="dwqa-filter-sticky-questions" style="line-height: 32px"><input type="checkbox" name="dwqa-filter-sticky-questions" id="dwqa-filter-sticky-questions" value="1" <?php checked( true, ( isset( $_GET['dwqa-filter-sticky-questions'] ) && sanitize_text_field( $_GET['post_type'] ) ) ? true : false, true ); ?>> <span class="description"><?php _e( 'Sticky Questions','dwqa' ) ?></span></label>
+            <label for="dwqa-filter-sticky-questions" style="line-height: 32px"><input type="checkbox"
+                                                                                       name="dwqa-filter-sticky-questions"
+                                                                                       id="dwqa-filter-sticky-questions"
+                                                                                       value="1" <?php checked( true, ( isset( $_GET['dwqa-filter-sticky-questions'] ) && sanitize_text_field( $_GET['post_type'] ) ) ? true : false, true ); ?>>
+                <span class="description"><?php _e( 'Sticky Questions', 'dwqa' ) ?></span></label>
 			<?php
 		}
 	}
@@ -461,13 +480,14 @@ public function posts_filter( $query ) {
 				$query->query_vars['post__in'] = $sticky_questions;
 			}
 		}
+
 		return $query;
 	}
 
 
 	public function delete_question() {
 		$valid_ajax = check_ajax_referer( '_dwqa_delete_question', 'nonce', false );
-		$nonce = isset($_POST['nonce']) ? esc_html( $_POST['nonce'] ) : false;
+		$nonce      = isset( $_POST['nonce'] ) ? esc_html( $_POST['nonce'] ) : false;
 		if ( ! $valid_ajax || ! wp_verify_nonce( $nonce, '_dwqa_delete_question' ) || ! is_user_logged_in() ) {
 			wp_send_json_error( array(
 				'message' => __( 'Hello, Are you cheating huh?', 'dwqa' )
@@ -476,7 +496,7 @@ public function delete_question() {
 
 		if ( ! isset( $_POST['question'] ) ) {
 			wp_send_json_error( array(
-				'message'   => __( 'Question is not valid','dwqa' )
+				'message' => __( 'Question is not valid', 'dwqa' )
 			) );
 		}
 
@@ -496,13 +516,13 @@ public function delete_question() {
 				) );
 			} else {
 				wp_send_json_error( array(
-					'question'  => $question->ID,
-					'message'   => __( 'Delete Action was failed','dwqa' )
+					'question' => $question->ID,
+					'message'  => __( 'Delete Action was failed', 'dwqa' )
 				) );
 			}
 		} else {
 			wp_send_json_error( array(
-				'message'   => __( 'You do not have permission to delete this question','dwqa' )
+				'message' => __( 'You do not have permission to delete this question', 'dwqa' )
 			) );
 		}
 	}
@@ -517,7 +537,7 @@ public function hook_on_remove_question( $post_id ) {
 
 				$answers = $wpdb->get_results( $query );
 
-				wp_cache_set( 'dwqa-answers-for'.$post_id, $answers, 'dwqa', 21600 );
+				wp_cache_set( 'dwqa-answers-for' . $post_id, $answers, 'dwqa', 21600 );
 			}
 
 			if ( ! empty( $answers ) ) {
@@ -539,7 +559,7 @@ public function do_this_hourly() {
 		$closed_questions = wp_cache_get( 'dwqa-closed-question' );
 		if ( false == $closed_questions ) {
 			global $wpdb;
-			$query = "SELECT `{$wpdb->posts}`.ID FROM `{$wpdb->posts}` JOIN `{$wpdb->postmeta}` ON `{$wpdb->posts}`.ID = `{$wpdb->postmeta}`.post_id WHERE 1=1 AND `{$wpdb->postmeta}`.meta_key = '_dwqa_status' AND `{$wpdb->postmeta}`.meta_value = 'closed' AND `{$wpdb->posts}`.post_status = 'publish' AND `{$wpdb->posts}`.post_type = 'dwqa-question'";
+			$query            = "SELECT `{$wpdb->posts}`.ID FROM `{$wpdb->posts}` JOIN `{$wpdb->postmeta}` ON `{$wpdb->posts}`.ID = `{$wpdb->postmeta}`.post_id WHERE 1=1 AND `{$wpdb->postmeta}`.meta_key = '_dwqa_status' AND `{$wpdb->postmeta}`.meta_value = 'closed' AND `{$wpdb->posts}`.post_status = 'publish' AND `{$wpdb->posts}`.post_type = 'dwqa-question'";
 			$closed_questions = $wpdb->get_results( $query );
 
 			wp_cache_set( 'dwqa-closed-question', $closed_questions );
@@ -548,7 +568,7 @@ public function do_this_hourly() {
 		if ( ! empty( $closed_questions ) ) {
 			foreach ( $closed_questions as $q ) {
 				$resolved_time = get_post_meta( $q->ID, '_dwqa_resolved_time', true );
-				if ( dwqa_is_resolved( $q->ID ) && ( time() - $resolved_time > (3 * 24 * 60 * 60 ) ) ) {
+				if ( dwqa_is_resolved( $q->ID ) && ( time() - $resolved_time > ( 3 * 24 * 60 * 60 ) ) ) {
 					update_post_meta( $q->ID, '_dwqa_status', 'resolved' );
 				}
 			}

From d0d77b0bbd29e35f7664fb26d34a2e9bb9743f05 Mon Sep 17 00:00:00 2001
From: Denver Prophit Jr <denver@denverprophit.us>
Date: Fri, 17 Nov 2017 07:48:32 -0500
Subject: [PATCH 2/6] Fixes Issue /designwall/dw-question-answer/#216

Add detection of yoast seo => breadcrumb function around line 7
---
 inc/Template.php | 864 +++++++++++++++++++++++++----------------------
 1 file changed, 461 insertions(+), 403 deletions(-)

diff --git a/inc/Template.php b/inc/Template.php
index f976847b..ebda009f 100644
--- a/inc/Template.php
+++ b/inc/Template.php
@@ -4,87 +4,109 @@
  * Print class for question detail container
  */
 function dwqa_breadcrumb() {
-	global $dwqa_general_settings;
-	$title = get_the_title( $dwqa_general_settings['pages']['archive-question'] );
-	$search = isset( $_GET['qs'] ) ? esc_html( $_GET['qs'] ) : false;
-	$author = isset( $_GET['user'] ) ? esc_html( $_GET['user'] ) : false;
-	$output = '';
-	if ( !is_singular( 'dwqa-question' ) ) {
-		$term = get_query_var( 'dwqa-question_category' ) ? get_query_var( 'dwqa-question_category' ) : ( get_query_var( 'dwqa-question_tag' ) ? get_query_var( 'dwqa-question_tag' ) : false );
-		$term = get_term_by( 'slug', $term, get_query_var( 'taxonomy' ) );
-		$tax_name = 'dwqa-question_tag' == get_query_var( 'taxonomy' ) ? __( 'Tag', 'dwqa' ) : __( 'Category', 'dwqa' );
-	} else {
-		$term = wp_get_post_terms( get_the_ID(), 'dwqa-question_category' );
-		if ( $term ) {
-			$term = $term[0];
-			$tax_name = __( 'Category', 'dwqa' );
+	if ( function_exists( 'yoast_breadcrumb' ) ) :
+		$post_types = array( 'dwqa-question' );
+		if ( is_post_type_archive( $post_types ) ):
+			?>
+            <div class="breadcrumbs">
+                <span xmlns:v="http://rdf.data-vocabulary.org/#">
+<span typeof="v:Breadcrumb"><a href="<?php echo home_url(); ?>/" rel="v:url" property="v:title">Home</a></span> »
+<span typeof="v:Breadcrumb"><strong class="breadcrumb_last"
+                                    property="v:title"><?php post_type_archive_title(); ?></strong></span>
+</span>
+            </div>
+			<?php
+		else :
+			yoast_breadcrumb( '<div class="breadcrumbs">', '</div>' );
+		endif;
+	else:
+
+		global $dwqa_general_settings;
+		$title  = get_the_title( $dwqa_general_settings['pages']['archive-question'] );
+		$search = isset( $_GET['qs'] ) ? esc_html( $_GET['qs'] ) : false;
+		$author = isset( $_GET['user'] ) ? esc_html( $_GET['user'] ) : false;
+		$output = '';
+		if ( ! is_singular( 'dwqa-question' ) ) {
+			$term     = get_query_var( 'dwqa-question_category' ) ? get_query_var( 'dwqa-question_category' ) : ( get_query_var( 'dwqa-question_tag' ) ? get_query_var( 'dwqa-question_tag' ) : false );
+			$term     = get_term_by( 'slug', $term, get_query_var( 'taxonomy' ) );
+			$tax_name = 'dwqa-question_tag' == get_query_var( 'taxonomy' ) ? __( 'Tag', 'dwqa' ) : __( 'Category', 'dwqa' );
+		} else {
+			$term = wp_get_post_terms( get_the_ID(), 'dwqa-question_category' );
+			if ( $term ) {
+				$term     = $term[0];
+				$tax_name = __( 'Category', 'dwqa' );
+			}
 		}
-	}
 
-	if ( is_singular( 'dwqa-question' ) || $search || $author || $term ) {
-		$output .= '<div class="dwqa-breadcrumbs">';
-	}
-
-	if ( $term || is_singular( 'dwqa-question' ) || $search || $author ) {
-		$output .= '<a href="'. get_permalink( $dwqa_general_settings['pages']['archive-question'] ) .'">' . $title . '</a>';
-	}
+		if ( is_singular( 'dwqa-question' ) || $search || $author || $term ) {
+			$output .= '<div class="dwqa-breadcrumbs">';
+		}
 
-	if ( $term ) {
-		$output .= '<span class="dwqa-sep"> &rsaquo; </span>';
-		if ( is_singular( 'dwqa-question' ) ) {
-			$output .= '<a href="'. esc_url( get_term_link( $term, get_query_var( 'taxonomy' ) ) ) .'">' . $tax_name . ': ' . $term->name . '</a>';
-		} else {
-			$output .= '<span class="dwqa-current">' . $tax_name . ': ' . $term->name . '</span>';
+		if ( $term || is_singular( 'dwqa-question' ) || $search || $author ) {
+			$output .= '<a href="' . get_permalink( $dwqa_general_settings['pages']['archive-question'] ) . '">' . $title . '</a>';
 		}
-	}
 
-	if ( $search ) {
-		$output .= '<span class="dwqa-sep"> &rsaquo; </span>';
-		$output .= sprintf( '<span class="dwqa-current">%s "%s"</span>', __( 'Showing search results for', 'dwqa' ), rawurldecode( $search ) );
-	}
+		if ( $term ) {
+			$output .= '<span class="dwqa-sep"> &rsaquo; </span>';
+			if ( is_singular( 'dwqa-question' ) ) {
+				$output .= '<a href="' . esc_url( get_term_link( $term, get_query_var( 'taxonomy' ) ) ) . '">' . $tax_name . ': ' . $term->name . '</a>';
+			} else {
+				$output .= '<span class="dwqa-current">' . $tax_name . ': ' . $term->name . '</span>';
+			}
+		}
 
-	if ( $author ) {
-		$output .= '<span class="dwqa-sep"> &rsaquo; </span>';
-		$output .= sprintf( '<span class="dwqa-current">%s "%s"</span>', __( 'Author', 'dwqa' ), rawurldecode( $author ) );
-	}
+		if ( $search ) {
+			$output .= '<span class="dwqa-sep"> &rsaquo; </span>';
+			$output .= sprintf( '<span class="dwqa-current">%s "%s"</span>', __( 'Showing search results for', 'dwqa' ), rawurldecode( $search ) );
+		}
 
-	if ( is_singular( 'dwqa-question' ) ) {
-		$output .= '<span class="dwqa-sep"> &rsaquo; </span>';
-		if ( !dwqa_is_edit() ) {
-			$output .= '<span class="dwqa-current">' . get_the_title() . '</span>';
-		} else {
-			$output .= '<a href="'. get_permalink() .'">'. get_the_title() .'</a>';
+		if ( $author ) {
 			$output .= '<span class="dwqa-sep"> &rsaquo; </span>';
-			$output .= '<span class="dwqa-current">'. __( 'Edit', 'dwqa' ) .'</span>';
+			$output .= sprintf( '<span class="dwqa-current">%s "%s"</span>', __( 'Author', 'dwqa' ), rawurldecode( $author ) );
 		}
-	}
-	if ( is_singular( 'dwqa-question' ) || $search || $author || $term ) {
-		$output .= '</div>';
-	}
 
+		if ( is_singular( 'dwqa-question' ) ) {
+			$output .= '<span class="dwqa-sep"> &rsaquo; </span>';
+			if ( ! dwqa_is_edit() ) {
+				$output .= '<span class="dwqa-current">' . get_the_title() . '</span>';
+			} else {
+				$output .= '<a href="' . get_permalink() . '">' . get_the_title() . '</a>';
+				$output .= '<span class="dwqa-sep"> &rsaquo; </span>';
+				$output .= '<span class="dwqa-current">' . __( 'Edit', 'dwqa' ) . '</span>';
+			}
+		}
+		if ( is_singular( 'dwqa-question' ) || $search || $author || $term ) {
+			$output .= '</div>';
+		}
+	endif;
 	echo apply_filters( 'dwqa_breadcrumb', $output );
 }
+
 add_action( 'dwqa_before_questions_archive', 'dwqa_breadcrumb' );
 add_action( 'dwqa_before_single_question', 'dwqa_breadcrumb' );
 
 function dwqa_archive_question_filter_layout() {
 	dwqa_load_template( 'archive', 'question-filter' );
 }
+
 add_action( 'dwqa_before_questions_archive', 'dwqa_archive_question_filter_layout', 12 );
 
 function dwqa_search_form() {
 	?>
-	<form id="dwqa-search" class="dwqa-search">
-		<input data-nonce="<?php echo wp_create_nonce( '_dwqa_filter_nonce' ) ?>" type="text" placeholder="<?php _e( 'What do you want to know?', 'dwqa' ); ?>" name="qs" value="<?php echo isset( $_GET['qs'] ) ? esc_html( $_GET['qs'] ) : '' ?>">
-	</form>
+    <form id="dwqa-search" class="dwqa-search">
+        <input data-nonce="<?php echo wp_create_nonce( '_dwqa_filter_nonce' ) ?>" type="text"
+               placeholder="<?php _e( 'What do you want to know?', 'dwqa' ); ?>" name="qs"
+               value="<?php echo isset( $_GET['qs'] ) ? esc_html( $_GET['qs'] ) : '' ?>">
+    </form>
 	<?php
 }
+
 add_action( 'dwqa_before_questions_archive', 'dwqa_search_form', 11 );
 
-function dwqa_class_for_question_details_container(){
-	$class = array();
+function dwqa_class_for_question_details_container() {
+	$class   = array();
 	$class[] = 'question-details';
-	$class = apply_filters( 'dwqa-class-questions-details-container', $class );
+	$class   = apply_filters( 'dwqa-class-questions-details-container', $class );
 	echo implode( ' ', $class );
 }
 
@@ -92,13 +114,13 @@ function dwqa_class_for_question_details_container(){
 function dwqa_answer_paginate_link() {
 	global $wp_query;
 	$question_url = get_permalink();
-	$page = isset( $_GET['ans-page'] ) ? intval( $_GET['ans-page'] ) : 1;
+	$page         = isset( $_GET['ans-page'] ) ? intval( $_GET['ans-page'] ) : 1;
 
 	$args = array(
-		'base' => add_query_arg( 'ans-page', '%#%', $question_url ),
-		'format' => '',
+		'base'    => add_query_arg( 'ans-page', '%#%', $question_url ),
+		'format'  => '',
 		'current' => $page,
-		'total' => $wp_query->dwqa_answers->max_num_pages
+		'total'   => $wp_query->dwqa_answers->max_num_pages
 	);
 
 	$paginate = paginate_links( $args );
@@ -119,21 +141,21 @@ function dwqa_question_paginate_link() {
 	global $wp_query, $dwqa_general_settings;
 
 	$archive_question_url = get_permalink( $dwqa_general_settings['pages']['archive-question'] );
-	$page_text = dwqa_is_front_page() ? 'page' : 'paged';
-	$page = get_query_var( $page_text ) ? get_query_var( $page_text ) : 1;
+	$page_text            = dwqa_is_front_page() ? 'page' : 'paged';
+	$page                 = get_query_var( $page_text ) ? get_query_var( $page_text ) : 1;
 
 	$tag = get_query_var( 'dwqa-question_tag' ) ? get_query_var( 'dwqa-question_tag' ) : false;
 	$cat = get_query_var( 'dwqa-question_category' ) ? get_query_var( 'dwqa-question_category' ) : false;
 
-	$url = $cat 
-			? get_term_link( $cat, get_query_var( 'taxonomy' ) ) 
-			: ( $tag ? get_term_link( $tag, get_query_var( 'taxonomy' ) ) : $archive_question_url );
+	$url = $cat
+		? get_term_link( $cat, get_query_var( 'taxonomy' ) )
+		: ( $tag ? get_term_link( $tag, get_query_var( 'taxonomy' ) ) : $archive_question_url );
 
 	$args = array(
-		'base' => add_query_arg( $page_text, '%#%', $url ),
-		'format' => '',
+		'base'    => add_query_arg( $page_text, '%#%', $url ),
+		'format'  => '',
 		'current' => $page,
-		'total' => $wp_query->dwqa_questions->max_num_pages
+		'total'   => $wp_query->dwqa_questions->max_num_pages
 	);
 
 	$paginate = paginate_links( $args );
@@ -154,18 +176,21 @@ function dwqa_question_button_action() {
 	$html = '';
 	if ( is_user_logged_in() ) {
 		$followed = dwqa_is_followed() ? 'followed' : 'follow';
-		$text = __( 'Subscribe', 'dwqa' );
-		$html .= '<label for="dwqa-favorites">';
-		$html .= '<input type="checkbox" id="dwqa-favorites" data-post="'. get_the_ID() .'" data-nonce="'. wp_create_nonce( '_dwqa_follow_question' ) .'" value="'. $followed .'" '. checked( $followed, 'followed', false ) .'/>';
-		$html .= '<span>' . $text . '</span>';
-		$html .= '</label>';
+		$text     = __( 'Subscribe', 'dwqa' );
+		$html     .= '<label for="dwqa-favorites">';
+		$html     .= '<input type="checkbox" id="dwqa-favorites" data-post="' . get_the_ID() . '" data-nonce="' . wp_create_nonce( '_dwqa_follow_question' ) . '" value="' . $followed . '" ' . checked( $followed, 'followed', false ) . '/>';
+		$html     .= '<span>' . $text . '</span>';
+		$html     .= '</label>';
 		if ( dwqa_current_user_can( 'edit_question' ) ) {
-			$html .= '<a class="dwqa_edit_question" href="'. add_query_arg( array( 'edit' => get_the_ID() ), get_permalink() ) .'">' . __( 'Edit', 'dwqa' ) . '</a> ';
+			$html .= '<a class="dwqa_edit_question" href="' . add_query_arg( array( 'edit' => get_the_ID() ), get_permalink() ) . '">' . __( 'Edit', 'dwqa' ) . '</a> ';
 		}
 
 		if ( dwqa_current_user_can( 'delete_question' ) ) {
-			$action_url = add_query_arg( array( 'action' => 'dwqa_delete_question', 'question_id' => get_the_ID() ), admin_url( 'admin-ajax.php' ) );
-			$html .= '<a class="dwqa_delete_question" href="'. wp_nonce_url( $action_url, '_dwqa_action_remove_question_nonce' ) .'">' . __( 'Delete', 'dwqa' ) . '</a> ';
+			$action_url = add_query_arg( array(
+				'action'      => 'dwqa_delete_question',
+				'question_id' => get_the_ID()
+			), admin_url( 'admin-ajax.php' ) );
+			$html       .= '<a class="dwqa_delete_question" href="' . wp_nonce_url( $action_url, '_dwqa_action_remove_question_nonce' ) . '">' . __( 'Delete', 'dwqa' ) . '</a> ';
 		}
 	}
 
@@ -177,12 +202,15 @@ function dwqa_answer_button_action() {
 	if ( is_user_logged_in() ) {
 		if ( dwqa_current_user_can( 'edit_answer' ) ) {
 			$parent_id = dwqa_get_question_from_answer_id();
-			$html .= '<a class="dwqa_edit_question" href="'. add_query_arg( array( 'edit' => get_the_ID() ), get_permalink( $parent_id ) ) .'">' . __( 'Edit', 'dwqa' ) . '</a> ';
+			$html      .= '<a class="dwqa_edit_question" href="' . add_query_arg( array( 'edit' => get_the_ID() ), get_permalink( $parent_id ) ) . '">' . __( 'Edit', 'dwqa' ) . '</a> ';
 		}
 
 		if ( dwqa_current_user_can( 'delete_answer' ) ) {
-			$action_url = add_query_arg( array( 'action' => 'dwqa_delete_answer', 'answer_id' => get_the_ID() ), admin_url( 'admin-ajax.php' ) );
-			$html .= '<a class="dwqa_delete_answer" href="'. wp_nonce_url( $action_url, '_dwqa_action_remove_answer_nonce' ) .'">' . __( 'Delete', 'dwqa' ) . '</a> ';
+			$action_url = add_query_arg( array(
+				'action'    => 'dwqa_delete_answer',
+				'answer_id' => get_the_ID()
+			), admin_url( 'admin-ajax.php' ) );
+			$html       .= '<a class="dwqa_delete_answer" href="' . wp_nonce_url( $action_url, '_dwqa_action_remove_answer_nonce' ) . '">' . __( 'Delete', 'dwqa' ) . '</a> ';
 		}
 	}
 
@@ -190,7 +218,7 @@ function dwqa_answer_button_action() {
 }
 
 
-function dwqa_question_add_class( $classes, $class, $post_id ){
+function dwqa_question_add_class( $classes, $class, $post_id ) {
 	if ( get_post_type( $post_id ) == 'dwqa-question' ) {
 
 		$have_new_reply = dwqa_have_new_reply();
@@ -198,8 +226,10 @@ function dwqa_question_add_class( $classes, $class, $post_id ){
 			$classes[] = 'staff-answered';
 		}
 	}
+
 	return $classes;
 }
+
 add_action( 'post_class', 'dwqa_question_add_class', 10, 3 );
 
 /**
@@ -222,32 +252,35 @@ function dwqa_question_comment_callback( $comment, $args, $depth ) {
 
 function dwqa_body_class( $classes ) {
 	global $post, $dwqa_options;
-	if ( ( $dwqa_options['pages']['archive-question'] && is_page( $dwqa_options['pages']['archive-question'] )  )
-		|| ( is_archive() &&  ( 'dwqa-question' == get_post_type()
-				|| 'dwqa-question' == get_query_var( 'post_type' )
-				|| 'dwqa-question_category' == get_query_var( 'taxonomy' )
-				|| 'dwqa-question_tag' == get_query_var( 'taxonomy' ) ) )
-	){
+	if ( ( $dwqa_options['pages']['archive-question'] && is_page( $dwqa_options['pages']['archive-question'] ) )
+	     || ( is_archive() && ( 'dwqa-question' == get_post_type()
+	                            || 'dwqa-question' == get_query_var( 'post_type' )
+	                            || 'dwqa-question_category' == get_query_var( 'taxonomy' )
+	                            || 'dwqa-question_tag' == get_query_var( 'taxonomy' ) ) )
+	) {
 		$classes[] = 'list-dwqa-question';
 	}
 
-	if ( $dwqa_options['pages']['submit-question'] && is_page( $dwqa_options['pages']['submit-question'] ) ){
+	if ( $dwqa_options['pages']['submit-question'] && is_page( $dwqa_options['pages']['submit-question'] ) ) {
 		$classes[] = 'submit-dwqa-question';
 	}
+
 	return $classes;
 }
+
 add_filter( 'body_class', 'dwqa_body_class' );
 
 
 /**
  * Add Icon for DW Question Answer Menu In Dashboard
  */
-function dwqa_add_guide_menu_icons_styles(){
+function dwqa_add_guide_menu_icons_styles() {
 	echo '<style type="text/css">#adminmenu .menu-icon-dwqa-question div.wp-menu-image:before {content: "\f223";}</style>';
 }
+
 add_action( 'admin_head', 'dwqa_add_guide_menu_icons_styles' );
 
-function dwqa_load_template( $name, $extend = false, $include = true ){
+function dwqa_load_template( $name, $extend = false, $include = true ) {
 	global $dwqa;
 	$dwqa->template->load_template( $name, $extend, $include );
 }
@@ -255,14 +288,14 @@ function dwqa_load_template( $name, $extend = false, $include = true ){
 function dwqa_post_class( $post_id = false ) {
 	$classes = array();
 
-	if ( !$post_id ) {
+	if ( ! $post_id ) {
 		$post_id = get_the_ID();
 	}
 
 	if ( 'dwqa-question' == get_post_type( $post_id ) ) {
 		$classes[] = 'dwqa-question-item';
 
-		if ( !is_singular( 'dwqa-question' ) && dwqa_is_sticky( $post_id ) ) {
+		if ( ! is_singular( 'dwqa-question' ) && dwqa_is_sticky( $post_id ) ) {
 			$classes[] = 'dwqa-sticky';
 		}
 	}
@@ -286,57 +319,61 @@ function dwqa_post_class( $post_id = false ) {
  * Enqueue all scripts for plugins on front-end
  * @return void
  */
-function dwqa_enqueue_scripts(){
-    global $dwqa, $dwqa_options, $script_version, $dwqa_sript_vars, $dwqa_general_settings;
-    $template_name = $dwqa->template->get_template();
+function dwqa_enqueue_scripts() {
+	global $dwqa, $dwqa_options, $script_version, $dwqa_sript_vars, $dwqa_general_settings;
+	$template_name = $dwqa->template->get_template();
 
 	$question_category_rewrite = $dwqa_general_settings['question-category-rewrite'];
-    $question_category_rewrite = $question_category_rewrite ? $question_category_rewrite : 'question-category';
-	$question_tag_rewrite = $dwqa_general_settings['question-tag-rewrite'];
-    $question_tag_rewrite = $question_tag_rewrite ? $question_tag_rewrite : 'question-tag';
-
-    $assets_folder = DWQA_URI . 'templates/assets/';
-    wp_enqueue_script( 'jquery' );
-    if( is_singular( 'dwqa-question' ) ) {
-        wp_enqueue_script( 'jquery-effects-core' );
-        wp_enqueue_script( 'jquery-effects-highlight' );
-    }
-    $script_version = $dwqa->get_last_update();
-
-    // Enqueue style
-    wp_enqueue_style( 'dwqa-style', $assets_folder . 'css/style.css', array(), $script_version );
-    wp_enqueue_style( 'dwqa-rtl', $assets_folder . 'css/rtl.css', array(), $script_version );
-    // Enqueue for single question page
-    if( is_single() && 'dwqa-question' == get_post_type() ) {
-        // js
-        wp_enqueue_script( 'dwqa-single-question', $assets_folder . 'js/dwqa-single-question.js', array('jquery'), $script_version, true );
-        $single_script_vars = $dwqa_sript_vars;
-        $single_script_vars['question_id'] = get_the_ID();
-        wp_localize_script( 'dwqa-single-question', 'dwqa', $single_script_vars );
-    }
-
-    $question_category = get_query_var( 'dwqa-question_category' );
-    if ( $question_category ) {
-		$question_category_rewrite = $dwqa_options['question-category-rewrite'] ? $dwqa_options['question-category-rewrite'] : 'question-category';
-    	$dwqa_sript_vars['taxonomy'][$question_category_rewrite] = $question_category;
-    }
-    $question_tag = get_query_var( 'dwqa-question_tag' );
-    if ( $question_tag ) {
-		$question_tag_rewrite = $dwqa_options['question-tag-rewrite'] ? $dwqa_options['question-tag-rewrite'] : 'question-category';
-    	$dwqa_sript_vars['taxonomy'][$question_tag_rewrite] = $question_tag;
-    }
-    if( (is_archive() && 'dwqa-question' == get_post_type()) || ( isset( $dwqa_options['pages']['archive-question'] ) && is_page( $dwqa_options['pages']['archive-question'] ) ) ) {
-        wp_enqueue_script( 'dwqa-questions-list', $assets_folder . 'js/dwqa-questions-list.js', array( 'jquery' ), $script_version, true );
-        wp_localize_script( 'dwqa-questions-list', 'dwqa', $dwqa_sript_vars );
-    }
-
-    if( isset($dwqa_options['pages']['submit-question'])
-        && is_page( $dwqa_options['pages']['submit-question'] ) ) {
-    	wp_enqueue_script( 'jquery-ui-autocomplete' );
-        wp_enqueue_script( 'dwqa-submit-question', $assets_folder . 'js/dwqa-submit-question.js', array( 'jquery', 'jquery-ui-autocomplete' ), $script_version, true );
-        wp_localize_script( 'dwqa-submit-question', 'dwqa', $dwqa_sript_vars );
-    }
+	$question_category_rewrite = $question_category_rewrite ? $question_category_rewrite : 'question-category';
+	$question_tag_rewrite      = $dwqa_general_settings['question-tag-rewrite'];
+	$question_tag_rewrite      = $question_tag_rewrite ? $question_tag_rewrite : 'question-tag';
+
+	$assets_folder = DWQA_URI . 'templates/assets/';
+	wp_enqueue_script( 'jquery' );
+	if ( is_singular( 'dwqa-question' ) ) {
+		wp_enqueue_script( 'jquery-effects-core' );
+		wp_enqueue_script( 'jquery-effects-highlight' );
+	}
+	$script_version = $dwqa->get_last_update();
+
+	// Enqueue style
+	wp_enqueue_style( 'dwqa-style', $assets_folder . 'css/style.css', array(), $script_version );
+	wp_enqueue_style( 'dwqa-rtl', $assets_folder . 'css/rtl.css', array(), $script_version );
+	// Enqueue for single question page
+	if ( is_single() && 'dwqa-question' == get_post_type() ) {
+		// js
+		wp_enqueue_script( 'dwqa-single-question', $assets_folder . 'js/dwqa-single-question.js', array( 'jquery' ), $script_version, true );
+		$single_script_vars                = $dwqa_sript_vars;
+		$single_script_vars['question_id'] = get_the_ID();
+		wp_localize_script( 'dwqa-single-question', 'dwqa', $single_script_vars );
+	}
+
+	$question_category = get_query_var( 'dwqa-question_category' );
+	if ( $question_category ) {
+		$question_category_rewrite                                 = $dwqa_options['question-category-rewrite'] ? $dwqa_options['question-category-rewrite'] : 'question-category';
+		$dwqa_sript_vars['taxonomy'][ $question_category_rewrite ] = $question_category;
+	}
+	$question_tag = get_query_var( 'dwqa-question_tag' );
+	if ( $question_tag ) {
+		$question_tag_rewrite                                 = $dwqa_options['question-tag-rewrite'] ? $dwqa_options['question-tag-rewrite'] : 'question-category';
+		$dwqa_sript_vars['taxonomy'][ $question_tag_rewrite ] = $question_tag;
+	}
+	if ( ( is_archive() && 'dwqa-question' == get_post_type() ) || ( isset( $dwqa_options['pages']['archive-question'] ) && is_page( $dwqa_options['pages']['archive-question'] ) ) ) {
+		wp_enqueue_script( 'dwqa-questions-list', $assets_folder . 'js/dwqa-questions-list.js', array( 'jquery' ), $script_version, true );
+		wp_localize_script( 'dwqa-questions-list', 'dwqa', $dwqa_sript_vars );
+	}
+
+	if ( isset( $dwqa_options['pages']['submit-question'] )
+	     && is_page( $dwqa_options['pages']['submit-question'] ) ) {
+		wp_enqueue_script( 'jquery-ui-autocomplete' );
+		wp_enqueue_script( 'dwqa-submit-question', $assets_folder . 'js/dwqa-submit-question.js', array(
+			'jquery',
+			'jquery-ui-autocomplete'
+		), $script_version, true );
+		wp_localize_script( 'dwqa-submit-question', 'dwqa', $dwqa_sript_vars );
+	}
 }
+
 add_action( 'wp_enqueue_scripts', 'dwqa_enqueue_scripts' );
 
 add_action( 'wp_footer', 'dwqa_wp_footer' );
@@ -345,106 +382,108 @@ function dwqa_wp_footer() {
 
 	if ( isset( $dwqa_general_settings['show-status-icon'] ) && $dwqa_general_settings['show-status-icon'] && dwqa_is_enable_status() ) {
 		?>
-		<style type="text/css">
-			@import url('https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css');
-
-			.dwqa-questions-list .dwqa-question-item {
-				padding-left: 70px;
-			}
-
-			.dwqa-questions-list .dwqa-question-item .avatar {
-				position: static;
-				width: 12px;
-				height: 12px;
-				margin-right: 5px;
-				margin-top: 0;
-				display: inline-block;
-			}
-
-			.dwqa-question-item .dwqa-status {
-				position: absolute;
-				left: 15px;
-				top: 50%;
-				width: 36px;
-				height: 36px;
-				margin-top: -18px;
-				border-radius: 36px;
-				text-indent: -9999px;
-				padding: 0;
-				background: none;
-				box-shadow: 0 0 0 1px #e67e22 inset;
-			}
-
-			.dwqa-question-item .dwqa-status:after {
-				content: "\f128";
-				display: block;
-				font: normal normal normal 14px/1 FontAwesome;
-				font-size: inherit;
-				text-rendering: auto;
-				-webkit-font-smoothing: antialiased;
-				-moz-osx-font-smoothing: grayscale;
-
-				color: #e67e22;
-				text-indent: 0;
-				font-size: 18px;
-				width: 36px;
-				height: 36px;
-				line-height: 36px;
-				text-align: center;
-				top: 0;
-				position: absolute;
-			}
-
-			.dwqa-question-item .dwqa-status-closed {
-				box-shadow: 0 0 0 1px #666 inset;
-			}
-
-			.dwqa-question-item .dwqa-status-closed:after {
-				color: #666;
-				content: "\f023";
-			}
-
-			.dwqa-question-item .dwqa-status-resolved {
-				box-shadow: 0 0 0 1px #578824 inset;
-			}
-
-			.dwqa-question-item .dwqa-status-resolved:after {
-				color: #578824;
-				content: "\f00c";
-			}
-
-			.dwqa-question-item .dwqa-status-answered {
-				box-shadow: 0 0 0 1px #1ba1e2 inset;
-			}
-
-			.dwqa-question-item .dwqa-status-answered:after {
-				color: #1ba1e2;
-				content: "\f112";
-				font-size: 14px;
-			}
-		</style>
+        <style type="text/css">
+            @import url('https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css');
+
+            .dwqa-questions-list .dwqa-question-item {
+                padding-left: 70px;
+            }
+
+            .dwqa-questions-list .dwqa-question-item .avatar {
+                position: static;
+                width: 12px;
+                height: 12px;
+                margin-right: 5px;
+                margin-top: 0;
+                display: inline-block;
+            }
+
+            .dwqa-question-item .dwqa-status {
+                position: absolute;
+                left: 15px;
+                top: 50%;
+                width: 36px;
+                height: 36px;
+                margin-top: -18px;
+                border-radius: 36px;
+                text-indent: -9999px;
+                padding: 0;
+                background: none;
+                box-shadow: 0 0 0 1px #e67e22 inset;
+            }
+
+            .dwqa-question-item .dwqa-status:after {
+                content: "\f128";
+                display: block;
+                font: normal normal normal 14px/1 FontAwesome;
+                font-size: inherit;
+                text-rendering: auto;
+                -webkit-font-smoothing: antialiased;
+                -moz-osx-font-smoothing: grayscale;
+
+                color: #e67e22;
+                text-indent: 0;
+                font-size: 18px;
+                width: 36px;
+                height: 36px;
+                line-height: 36px;
+                text-align: center;
+                top: 0;
+                position: absolute;
+            }
+
+            .dwqa-question-item .dwqa-status-closed {
+                box-shadow: 0 0 0 1px #666 inset;
+            }
+
+            .dwqa-question-item .dwqa-status-closed:after {
+                color: #666;
+                content: "\f023";
+            }
+
+            .dwqa-question-item .dwqa-status-resolved {
+                box-shadow: 0 0 0 1px #578824 inset;
+            }
+
+            .dwqa-question-item .dwqa-status-resolved:after {
+                color: #578824;
+                content: "\f00c";
+            }
+
+            .dwqa-question-item .dwqa-status-answered {
+                box-shadow: 0 0 0 1px #1ba1e2 inset;
+            }
+
+            .dwqa-question-item .dwqa-status-answered:after {
+                color: #1ba1e2;
+                content: "\f112";
+                font-size: 14px;
+            }
+        </style>
 		<?php
 	}
 }
 
 function dwqa_comment_form( $args = array(), $post_id = null ) {
-	if ( null === $post_id )
+	if ( null === $post_id ) {
 		$post_id = get_the_ID();
-	else
+	} else {
 		$id = $post_id;
-	$commenter = wp_get_current_commenter();
-	$user = wp_get_current_user();
+	}
+	$commenter     = wp_get_current_commenter();
+	$user          = wp_get_current_user();
 	$user_identity = $user->exists() ? $user->display_name : '';
-	$args = wp_parse_args( $args );
-	if ( ! isset( $args['format'] ) )
+	$args          = wp_parse_args( $args );
+	if ( ! isset( $args['format'] ) ) {
 		$args['format'] = current_theme_supports( 'html5', 'comment-form' ) ? 'html5' : 'xhtml';
-	$req      = get_option( 'require_name_email' );
-	$aria_req = ( $req ? " aria-required='true'" : '' );
-	$html5    = 'html5' === $args['format'];
-	$fields   = array(
+	}
+	$req           = get_option( 'require_name_email' );
+	$aria_req      = ( $req ? " aria-required='true'" : '' );
+	$html5         = 'html5' === $args['format'];
+	$fields        = array(
 		'email'  => '<p class="comment-form-email"><label for="email">' . __( 'Email', 'dwqa' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
-					'<input id="email-'.$post_id.'" name="email" ' . ( $html5 ? 'type="email"' : 'type="text"' ) . ' value="' . esc_attr(  $commenter['comment_author_email'] ) . '" size="30"' . $aria_req . ' /></p>',
-		'author'  => '<p class="comment-form-name"><label for="name">' . __( 'Name', 'dwqa' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label>' . '<input id="name-' .$post_id.'" name="name" type="text" value="" size="30"/></p>'
+		            '<input id="email-' . $post_id . '" name="email" ' . ( $html5 ? 'type="email"' : 'type="text"' ) . ' value="' . esc_attr( $commenter['comment_author_email'] ) . '" size="30"' . $aria_req . ' /></p>',
+		'author' => '<p class="comment-form-name"><label for="name">' . __( 'Name', 'dwqa' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label>' . '<input id="name-' . $post_id . '" name="name" type="text" value="" size="30"/></p>'
 	);
 	$required_text = sprintf( ' ' . __( 'Required fields are marked %s' ), '<span class="required">*</span>' );
 	/**
@@ -454,18 +493,18 @@ function dwqa_comment_form( $args = array(), $post_id = null ) {
 	 *
 	 * @param array $fields The default comment fields.
 	 */
-	$fields = apply_filters( 'comment_form_default_fields', $fields );
+	$fields   = apply_filters( 'comment_form_default_fields', $fields );
 	$defaults = array(
 		'fields'               => $fields,
 		'comment_field'        => '',
-		'must_log_in'          => '<p class="must-log-in">' . sprintf( __( 'You must be <a href="%s">logged in</a> to post a comment.','dwqa' ), wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '</p>',
+		'must_log_in'          => '<p class="must-log-in">' . sprintf( __( 'You must be <a href="%s">logged in</a> to post a comment.', 'dwqa' ), wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '</p>',
 		'logged_in_as'         => '<p class="comment-form-comment"><textarea id="comment" name="comment" placeholder="Comment" rows="2" aria-required="true"></textarea></p>',
 		'comment_notes_before' => '<p class="comment-form-comment"><textarea id="comment" name="comment" placeholder="Comment" rows="2" aria-required="true"></textarea></p>',
-		'comment_notes_after'  => '<p class="form-allowed-tags">' . sprintf( __( 'You may use these <abbr title="HyperText Markup Language">HTML</abbr> tags and attributes: %s','dwqa' ), ' <code>' . allowed_tags() . '</code>' ) . '</p>',
+		'comment_notes_after'  => '<p class="form-allowed-tags">' . sprintf( __( 'You may use these <abbr title="HyperText Markup Language">HTML</abbr> tags and attributes: %s', 'dwqa' ), ' <code>' . allowed_tags() . '</code>' ) . '</p>',
 		'id_form'              => 'commentform',
 		'id_submit'            => 'submit',
-		'title_reply'          => __( 'Leave a Reply','dwqa' ),
-		'title_reply_to'       => __( 'Leave a Reply to %s','dwqa' ),
+		'title_reply'          => __( 'Leave a Reply', 'dwqa' ),
+		'title_reply_to'       => __( 'Leave a Reply to %s', 'dwqa' ),
 		'cancel_reply_link'    => __( 'Cancel reply', 'dwqa' ),
 		'label_submit'         => __( 'Post Comment', 'dwqa' ),
 		'format'               => 'xhtml',
@@ -488,108 +527,110 @@ function dwqa_comment_form( $args = array(), $post_id = null ) {
 		 */
 		do_action( 'comment_form_before' );
 		?>
-		<div id="dwqa-respond" class="dwqa-comment-form">
-		<?php if ( !dwqa_current_user_can( 'post_comment' ) ) : ?>
-			<?php echo $args['must_log_in']; ?>
-			<?php
-			/**
-			 * Fires after the HTML-formatted 'must log in after' message in the comment form.
-			 *
-			 * @since 3.0.0
-			 */
-			do_action( 'comment_form_must_log_in_after' );
-			?>
-		<?php else : ?>
-			<form method="post" id="<?php echo esc_attr( $args['id_form'] ); ?>" class="comment-form"<?php echo $html5 ? ' novalidate' : ''; ?>>
-			<?php
-			/**
-			 * Fires at the top of the comment form, inside the <form> tag.
-			 *
-			 * @since 3.0.0
-			 */
-			do_action( 'comment_form_top' );
-			?>
-			<?php if ( is_user_logged_in() ) : ?>
+        <div id="dwqa-respond" class="dwqa-comment-form">
+			<?php if ( ! dwqa_current_user_can( 'post_comment' ) ) : ?>
+				<?php echo $args['must_log_in']; ?>
 				<?php
 				/**
-				 * Filter the 'logged in' message for the comment form for display.
+				 * Fires after the HTML-formatted 'must log in after' message in the comment form.
 				 *
 				 * @since 3.0.0
-				 *
-				 * @param string $args['logged_in_as'] The logged-in-as HTML-formatted message.
-				 * @param array  $commenter            An array containing the comment author's username, email, and URL.
-				 * @param string $user_identity        If the commenter is a registered user, the display name, blank otherwise.
 				 */
-				echo apply_filters( 'comment_form_logged_in', $args['logged_in_as'], $commenter, $user_identity );
-				?>
-				<?php
-				/**
-				 * Fires after the is_user_logged_in() check in the comment form.
-				 *
-				 * @since 3.0.0
-				 *
-				 * @param array  $commenter     An array containing the comment author's username, email, and URL.
-				 * @param string $user_identity If the commenter is a registered user, the display name, blank otherwise.
-				 */
-				do_action( 'comment_form_logged_in_after', $commenter, $user_identity );
+				do_action( 'comment_form_must_log_in_after' );
 				?>
 			<?php else : ?>
-				<?php echo $args['comment_notes_before']; ?>
-				<?php
-				/**
-				 * Fires before the comment fields in the comment form.
-				 *
-				 * @since 3.0.0
-				 */
-				do_action( 'comment_form_before_fields' );
-				echo '<div class="dwqa-anonymous-fields">';
-				foreach ( (array ) $args['fields'] as $name => $field ) {
+                <form method="post" id="<?php echo esc_attr( $args['id_form'] ); ?>"
+                      class="comment-form"<?php echo $html5 ? ' novalidate' : ''; ?>>
+					<?php
 					/**
-					 * Filter a comment form field for display.
+					 * Fires at the top of the comment form, inside the <form> tag.
 					 *
-					 * The dynamic portion of the filter hook, $name, refers to the name
-					 * of the comment form field. Such as 'author', 'email', or 'url'.
+					 * @since 3.0.0
+					 */
+					do_action( 'comment_form_top' );
+					?>
+					<?php if ( is_user_logged_in() ) : ?>
+						<?php
+						/**
+						 * Filter the 'logged in' message for the comment form for display.
+						 *
+						 * @since 3.0.0
+						 *
+						 * @param string $args ['logged_in_as'] The logged-in-as HTML-formatted message.
+						 * @param array $commenter An array containing the comment author's username, email, and URL.
+						 * @param string $user_identity If the commenter is a registered user, the display name, blank otherwise.
+						 */
+						echo apply_filters( 'comment_form_logged_in', $args['logged_in_as'], $commenter, $user_identity );
+						?>
+						<?php
+						/**
+						 * Fires after the is_user_logged_in() check in the comment form.
+						 *
+						 * @since 3.0.0
+						 *
+						 * @param array $commenter An array containing the comment author's username, email, and URL.
+						 * @param string $user_identity If the commenter is a registered user, the display name, blank otherwise.
+						 */
+						do_action( 'comment_form_logged_in_after', $commenter, $user_identity );
+						?>
+					<?php else : ?>
+						<?php echo $args['comment_notes_before']; ?>
+						<?php
+						/**
+						 * Fires before the comment fields in the comment form.
+						 *
+						 * @since 3.0.0
+						 */
+						do_action( 'comment_form_before_fields' );
+						echo '<div class="dwqa-anonymous-fields">';
+						foreach ( (array ) $args['fields'] as $name => $field ) {
+							/**
+							 * Filter a comment form field for display.
+							 *
+							 * The dynamic portion of the filter hook, $name, refers to the name
+							 * of the comment form field. Such as 'author', 'email', or 'url'.
+							 *
+							 * @since 3.0.0
+							 *
+							 * @param string $field The HTML-formatted output of the comment form field.
+							 */
+							echo apply_filters( "comment_form_field_{$name}", $field ) . "\n";
+						}
+						echo '</div>';
+						/**
+						 * Fires after the comment fields in the comment form.
+						 *
+						 * @since 3.0.0
+						 */
+						do_action( 'comment_form_after_fields' );
+						?>
+					<?php endif; ?>
+					<?php
+					/**
+					 * Filter the content of the comment textarea field for display.
 					 *
 					 * @since 3.0.0
 					 *
-					 * @param string $field The HTML-formatted output of the comment form field.
+					 * @param string $args ['comment_field'] The content of the comment textarea field.
 					 */
-					echo apply_filters( "comment_form_field_{$name}", $field ) . "\n";
-				}
-				echo '</div>';
-				/**
-				 * Fires after the comment fields in the comment form.
-				 *
-				 * @since 3.0.0
-				 */
-				do_action( 'comment_form_after_fields' );
-				?>
+					echo apply_filters( 'comment_form_field_comment', $args['comment_field'] );
+					?>
+                    <input name="comment-submit" type="submit" id="<?php echo esc_attr( $args['id_submit'] ); ?>"
+                           value="<?php echo esc_attr( $args['label_submit'] ); ?>" class="dwqa-btn dwqa-btn-primary"/>
+					<?php comment_id_fields( $post_id ); ?>
+					<?php
+					/**
+					 * Fires at the bottom of the comment form, inside the closing </form> tag.
+					 *
+					 * @since 1.5.0
+					 *
+					 * @param int $post_id The post ID.
+					 */
+					do_action( 'comment_form', $post_id );
+					?>
+                </form>
 			<?php endif; ?>
-			<?php
-			/**
-			 * Filter the content of the comment textarea field for display.
-			 *
-			 * @since 3.0.0
-			 *
-			 * @param string $args['comment_field'] The content of the comment textarea field.
-			 */
-			echo apply_filters( 'comment_form_field_comment', $args['comment_field'] );
-			?>
-			<input name="comment-submit" type="submit" id="<?php echo esc_attr( $args['id_submit'] ); ?>" value="<?php echo esc_attr( $args['label_submit'] ); ?>" class="dwqa-btn dwqa-btn-primary" />
-			<?php comment_id_fields( $post_id ); ?>
-			<?php
-			/**
-			 * Fires at the bottom of the comment form, inside the closing </form> tag.
-			 *
-			 * @since 1.5.0
-			 *
-			 * @param int $post_id The post ID.
-			 */
-			do_action( 'comment_form', $post_id );
-			?>
-			</form>
-		<?php endif; ?>
-		</div><!-- #respond -->
+        </div><!-- #respond -->
 		<?php
 		/**
 		 * Fires after the comment form.
@@ -607,25 +648,26 @@ function dwqa_comment_form( $args = array(), $post_id = null ) {
 	endif;
 }
 
-function dwqa_display_sticky_questions(){
+function dwqa_display_sticky_questions() {
 	$sticky_questions = get_option( 'dwqa_sticky_questions', array() );
 	if ( ! empty( $sticky_questions ) ) {
-		$query = array(
-			'post_type' => 'dwqa-question',
-			'post__in' => $sticky_questions,
+		$query            = array(
+			'post_type'      => 'dwqa-question',
+			'post__in'       => $sticky_questions,
 			'posts_per_page' => 40,
 		);
 		$sticky_questions = new WP_Query( $query );
 		?>
-		<div class="sticky-questions">
+        <div class="sticky-questions">
 			<?php while ( $sticky_questions->have_posts() ) : $sticky_questions->the_post(); ?>
 				<?php dwqa_load_template( 'content', 'question' ); ?>
 			<?php endwhile; ?>
-		</div>
+        </div>
 		<?php
 		wp_reset_postdata();
 	}
 }
+
 add_action( 'dwqa-before-question-list', 'dwqa_display_sticky_questions' );
 
 function dwqa_is_sticky( $question_id = false ) {
@@ -636,20 +678,23 @@ function dwqa_is_sticky( $question_id = false ) {
 	if ( in_array( $question_id, $sticky_questions ) ) {
 		return true;
 	}
+
 	return false;
 }
 
 
-function dwqa_question_states( $states, $post ){
+function dwqa_question_states( $states, $post ) {
 	if ( dwqa_is_sticky( $post->ID ) && 'dwqa-question' == get_post_type( $post->ID ) ) {
-		$states[] = __( 'Sticky Question','dwqa' );
+		$states[] = __( 'Sticky Question', 'dwqa' );
 	}
+
 	return $states;
 }
+
 add_filter( 'display_post_states', 'dwqa_question_states', 10, 2 );
 
 
-function dwqa_get_ask_question_link( $echo = true, $label = false, $class = false ){
+function dwqa_get_ask_question_link( $echo = true, $label = false, $class = false ) {
 	global $dwqa_options;
 	$submit_question_link = get_permalink( $dwqa_options['pages']['submit-question'] );
 	if ( $dwqa_options['pages']['submit-question'] && $submit_question_link ) {
@@ -658,7 +703,7 @@ function dwqa_get_ask_question_link( $echo = true, $label = false, $class = fals
 		if ( dwqa_current_user_can( 'post_question' ) ) {
 			$label = $label ? $label : __( 'Ask a question', 'dwqa' );
 		} elseif ( ! is_user_logged_in() ) {
-			$label = $label ? $label : __( 'Login to ask a question', 'dwqa' );
+			$label                = $label ? $label : __( 'Login to ask a question', 'dwqa' );
 			$submit_question_link = wp_login_url( $submit_question_link );
 		} else {
 			return false;
@@ -666,8 +711,8 @@ function dwqa_get_ask_question_link( $echo = true, $label = false, $class = fals
 		//Add filter to change ask question link text
 		$label = apply_filters( 'dwqa_ask_question_link_label', $label );
 
-		$class = $class ? $class  : 'dwqa-btn-success';
-		$button = '<a href="'.$submit_question_link.'" class="dwqa-btn '.$class.'">'.$label.'</a>';
+		$class  = $class ? $class : 'dwqa-btn-success';
+		$button = '<a href="' . $submit_question_link . '" class="dwqa-btn ' . $class . '">' . $label . '</a>';
 		$button = apply_filters( 'dwqa_ask_question_link', $button, $submit_question_link );
 		if ( ! $echo ) {
 			return $button;
@@ -685,12 +730,12 @@ function dwqa_get_template( $template = false ) {
 	) );
 
 	$temp_dir = array(
-		1 => trailingslashit( get_stylesheet_directory() ),
+		1  => trailingslashit( get_stylesheet_directory() ),
 		10 => trailingslashit( get_template_directory() )
 	);
 
 	if ( isset( $template ) ) {
-		foreach( $temp_dir as $link ) {
+		foreach ( $temp_dir as $link ) {
 			if ( file_exists( $link . $template ) ) {
 				return $link . $template;
 			}
@@ -702,12 +747,13 @@ function dwqa_get_template( $template = false ) {
 		if ( $template == $old_template ) {
 			continue;
 		}
-		foreach( $temp_dir as $link ) {
+		foreach ( $temp_dir as $link ) {
 			if ( file_exists( $link . $template ) ) {
 				return $link . $template;
 			}
 		}
 	}
+
 	return false;
 }
 
@@ -716,13 +762,15 @@ function dwqa_has_sidebar_template() {
 	$template = get_stylesheet_directory() . '/dwqa-templates/';
 	if ( is_single() && file_exists( $template . '/sidebar-single.php' ) ) {
 		include $template . '/sidebar-single.php';
+
 		return;
 	} elseif ( is_single() ) {
-		if ( file_exists( DWQA_DIR . 'inc/templates/'.$dwqa_template.'/sidebar-single.php' ) ) {
-			include DWQA_DIR . 'inc/templates/'.$dwqa_template.'/sidebar-single.php';
+		if ( file_exists( DWQA_DIR . 'inc/templates/' . $dwqa_template . '/sidebar-single.php' ) ) {
+			include DWQA_DIR . 'inc/templates/' . $dwqa_template . '/sidebar-single.php';
 		} else {
 			get_sidebar();
 		}
+
 		return;
 	}
 
@@ -778,13 +826,15 @@ public function redirect_answer_to_question( $template ) {
 				exit( 0 );
 			}
 		}
+
 		return $template;
 	}
 
 	public function generate_template_for_comment_form( $comment_template ) {
-		if (  is_single() && ('dwqa-question' == get_post_type() || 'dwqa-answer' == get_post_type() ) ) {
+		if ( is_single() && ( 'dwqa-question' == get_post_type() || 'dwqa-answer' == get_post_type() ) ) {
 			return $this->load_template( 'comments', false, false );
 		}
+
 		return $comment_template;
 	}
 
@@ -795,7 +845,10 @@ public function page_template_body_class( $classes ) {
 		$template_parts = explode( '/', $template_slug );
 
 		foreach ( $template_parts as $part ) {
-			$classes[] = 'page-template-' . sanitize_html_class( str_replace( array( '.', '/' ), '-', basename( $part, '.php' ) ) );
+			$classes[] = 'page-template-' . sanitize_html_class( str_replace( array(
+					'.',
+					'/'
+				), '-', basename( $part, '.php' ) ) );
 			$classes[] = sanitize_html_class( str_replace( array( '.', '/' ), '-', basename( $part, '.php' ) ) );
 		}
 		$classes[] = 'page-template-' . sanitize_html_class( str_replace( '.', '-', $template_slug ) );
@@ -805,13 +858,13 @@ public function page_template_body_class( $classes ) {
 
 	public function question_content( $template ) {
 		global $wp_query;
-		$dwqa_options = get_option( 'dwqa_options' );
+		$dwqa_options    = get_option( 'dwqa_options' );
 		$template_folder = trailingslashit( get_template_directory() );
 		if ( isset( $dwqa_options['pages']['archive-question'] ) ) {
 			$page_template = get_post_meta( $dwqa_options['pages']['archive-question'], '_wp_page_template', true );
 		}
 
-		$page_template = isset( $page_template ) && !empty( $page_template ) ? $page_template : 'page.php';
+		$page_template       = isset( $page_template ) && ! empty( $page_template ) ? $page_template : 'page.php';
 		$this->page_template = $page_template;
 
 		if ( is_singular( 'dwqa-question' ) ) {
@@ -833,20 +886,21 @@ public function question_content( $template ) {
 			global $post, $current_user;
 
 			$this->reset_content( array(
-				'ID'             => $post->ID,
-				'post_title'     => $post->post_title,
-				'post_author'    => 0,
-				'post_date'      => $post->post_date,
-				'post_content'   => $content,
-				'post_type'      => 'dwqa-question',
-				'post_status'    => $post->post_status,
-				'is_single'      => true,
+				'ID'           => $post->ID,
+				'post_title'   => $post->post_title,
+				'post_author'  => 0,
+				'post_date'    => $post->post_date,
+				'post_content' => $content,
+				'post_type'    => 'dwqa-question',
+				'post_status'  => $post->post_status,
+				'is_single'    => true,
 			) );
 
 			$single_template = isset( $dwqa_options['single-template'] ) ? $dwqa_options['single-template'] : false;
 
 			$this->remove_all_filters( 'the_content' );
 			add_filter( 'body_class', array( $this, 'page_template_body_class' ) );
+
 			return dwqa_get_template( $page_template );
 		}
 		if ( is_tax( 'dwqa-question_category' ) || is_tax( 'dwqa-question_tag' ) || is_post_type_archive( 'dwqa-question' ) || is_post_type_archive( 'dwqa-answer' ) || isset( $wp_query->query_vars['dwqa-question_tag'] ) || isset( $wp_query->query_vars['dwqa-question_category'] ) ) {
@@ -859,6 +913,7 @@ public function question_content( $template ) {
 				}
 				$this->reset_content( $page );
 				add_filter( 'body_class', array( $this, 'page_template_body_class' ) );
+
 				return dwqa_get_template( $page_template );
 			}
 		}
@@ -899,16 +954,16 @@ public function reset_content( $args ) {
 				'comment_count'         => $wp_query->post->comment_count,
 				'filter'                => $wp_query->post->filter,
 
-				'is_404'                => false,
-				'is_page'               => false,
-				'is_single'             => false,
-				'is_archive'            => false,
-				'is_tax'                => false,
-				'current_comment'		=> 0,
+				'is_404'          => false,
+				'is_page'         => false,
+				'is_single'       => false,
+				'is_archive'      => false,
+				'is_tax'          => false,
+				'current_comment' => 0,
 			) );
 		} else {
 			$dummy = wp_parse_args( $args, array(
-				'ID'                    => -1,
+				'ID'                    => - 1,
 				'post_status'           => 'private',
 				'post_author'           => 0,
 				'post_parent'           => 0,
@@ -933,12 +988,12 @@ public function reset_content( $args ) {
 				'comment_count'         => 0,
 				'filter'                => 'raw',
 
-				'is_404'                => false,
-				'is_page'               => false,
-				'is_single'             => false,
-				'is_archive'            => false,
-				'is_tax'                => false,
-				'current_comment'		=> 0,
+				'is_404'          => false,
+				'is_page'         => false,
+				'is_single'       => false,
+				'is_archive'      => false,
+				'is_tax'          => false,
+				'current_comment' => 0,
 			) );
 		}
 		// Bail if dummy post is empty
@@ -949,17 +1004,17 @@ public function reset_content( $args ) {
 		$post = new WP_Post( (object ) $dummy );
 		setup_postdata( $post );
 		// Copy the new post global into the main $wp_query
-		$wp_query->post       = $post;
-		$wp_query->posts      = array( $post );
+		$wp_query->post  = $post;
+		$wp_query->posts = array( $post );
 
 		// Prevent comments form from appearing
-		$wp_query->post_count 		= 1;
-		$wp_query->is_404     		= $dummy['is_404'];
-		$wp_query->is_page    		= $dummy['is_page'];
-		$wp_query->is_single  		= $dummy['is_single'];
-		$wp_query->is_archive 		= $dummy['is_archive'];
-		$wp_query->is_tax     		= $dummy['is_tax'];
-		$wp_query->current_comment 	= $dummy['current_comment'];
+		$wp_query->post_count      = 1;
+		$wp_query->is_404          = $dummy['is_404'];
+		$wp_query->is_page         = $dummy['is_page'];
+		$wp_query->is_single       = $dummy['is_single'];
+		$wp_query->is_archive      = $dummy['is_archive'];
+		$wp_query->is_tax          = $dummy['is_tax'];
+		$wp_query->current_comment = $dummy['current_comment'];
 
 	}
 
@@ -976,6 +1031,7 @@ public function close_default_comment( $open ) {
 		if ( is_singular( 'dwqa-question' ) || is_singular( 'dwqa-answer' ) || ( $dwqa_options['pages']['archive-question'] && is_page( $dwqa_options['pages']['archive-question'] ) ) || ( $dwqa_options['pages']['submit-question'] && is_page( $dwqa_options['pages']['submit-question'] ) ) ) {
 			return false;
 		}
+
 		return $open;
 	}
 
@@ -983,36 +1039,36 @@ public function remove_all_filters( $tag, $priority = false ) {
 		global $wp_filter, $merged_filters;
 
 		// Filters exist
-		if ( isset( $wp_filter[$tag] ) ) {
+		if ( isset( $wp_filter[ $tag ] ) ) {
 
 			// Filters exist in this priority
-			if ( ! empty( $priority ) && isset( $wp_filter[$tag][$priority] ) ) {
+			if ( ! empty( $priority ) && isset( $wp_filter[ $tag ][ $priority ] ) ) {
 
 				// Store filters in a backup
-				$this->filters->wp_filter[$tag][$priority] = $wp_filter[$tag][$priority];
+				$this->filters->wp_filter[ $tag ][ $priority ] = $wp_filter[ $tag ][ $priority ];
 
 				// Unset the filters
-				unset( $wp_filter[$tag][$priority] );
+				unset( $wp_filter[ $tag ][ $priority ] );
 
 				// Priority is empty
 			} else {
 
 				// Store filters in a backup
-				$this->filters->wp_filter[$tag] = $wp_filter[$tag];
+				$this->filters->wp_filter[ $tag ] = $wp_filter[ $tag ];
 
 				// Unset the filters
-				unset( $wp_filter[$tag] );
+				unset( $wp_filter[ $tag ] );
 			}
 		}
 
 		// Check merged filters
-		if ( isset( $merged_filters[$tag] ) ) {
+		if ( isset( $merged_filters[ $tag ] ) ) {
 
 			// Store filters in a backup
-			$this->filters->merged_filters[$tag] = $merged_filters[$tag];
+			$this->filters->merged_filters[ $tag ] = $merged_filters[ $tag ];
 
 			// Unset the filters
-			unset( $merged_filters[$tag] );
+			unset( $merged_filters[ $tag ] );
 		}
 
 		return true;
@@ -1022,35 +1078,35 @@ public function restore_all_filters( $tag, $priority = false ) {
 		global $wp_filter, $merged_filters;
 
 		// Filters exist
-		if ( isset( $this->filters->wp_filter[$tag] ) ) {
+		if ( isset( $this->filters->wp_filter[ $tag ] ) ) {
 
 			// Filters exist in this priority
-			if ( ! empty( $priority ) && isset( $this->filters->wp_filter[$tag][$priority] ) ) {
+			if ( ! empty( $priority ) && isset( $this->filters->wp_filter[ $tag ][ $priority ] ) ) {
 
 				// Store filters in a backup
-				$wp_filter[$tag][$priority] = $this->filters->wp_filter[$tag][$priority];
+				$wp_filter[ $tag ][ $priority ] = $this->filters->wp_filter[ $tag ][ $priority ];
 
 				// Unset the filters
-				unset( $this->filters->wp_filter[$tag][$priority] );
+				unset( $this->filters->wp_filter[ $tag ][ $priority ] );
 				// Priority is empty
 			} else {
 
 				// Store filters in a backup
-				$wp_filter[$tag] = $this->filters->wp_filter[$tag];
+				$wp_filter[ $tag ] = $this->filters->wp_filter[ $tag ];
 
 				// Unset the filters
-				unset( $this->filters->wp_filter[$tag] );
+				unset( $this->filters->wp_filter[ $tag ] );
 			}
 		}
 
 		// Check merged filters
-		if ( isset( $this->filters->merged_filters[$tag] ) ) {
+		if ( isset( $this->filters->merged_filters[ $tag ] ) ) {
 
 			// Store filters in a backup
-			$merged_filters[$tag] = $this->filters->merged_filters[$tag];
+			$merged_filters[ $tag ] = $this->filters->merged_filters[ $tag ];
 
 			// Unset the filters
-			unset( $this->filters->merged_filters[$tag] );
+			unset( $this->filters->merged_filters[ $tag ] );
 		}
 
 		return true;
@@ -1069,14 +1125,14 @@ public function load_template( $name, $extend = false, $include = true ) {
 			$name .= '-' . $extend;
 		}
 
-		$template = false;
+		$template     = false;
 		$template_dir = array(
 			DWQA_STYLESHEET_DIR . $this->get_template_dir(),
 			DWQA_TEMP_DIR . $this->get_template_dir(),
 			DWQA_DIR . 'templates/'
 		);
 
-		foreach( $template_dir as $temp_path ) {
+		foreach ( $template_dir as $temp_path ) {
 			if ( file_exists( $temp_path . $name . '.php' ) ) {
 				$template = $temp_path . $name . '.php';
 				break;
@@ -1085,8 +1141,9 @@ public function load_template( $name, $extend = false, $include = true ) {
 
 		$template = apply_filters( 'dwqa-load-template', $template, $name );
 
-		if ( !$template || !file_exists( $template ) ) {
+		if ( ! $template || ! file_exists( $template ) ) {
 			_doing_it_wrong( __FUNCTION__, sprintf( "<strong>%s</strong> does not exists in <code>%s</code>.", $name, $template ), '1.4.0' );
+
 			return false;
 		}
 
@@ -1105,11 +1162,12 @@ function dwqa_get_mail_template( $option, $name = '' ) {
 	if ( $template ) {
 		return $template;
 	} else {
-		if ( file_exists( DWQA_DIR . 'templates/email/'.$name.'.html' ) ) {
+		if ( file_exists( DWQA_DIR . 'templates/email/' . $name . '.html' ) ) {
 			ob_start();
-			load_template( DWQA_DIR . 'templates/email/'.$name.'.html', false );
+			load_template( DWQA_DIR . 'templates/email/' . $name . '.html', false );
 			$template = ob_get_contents();
 			ob_end_clean();
+
 			return $template;
 		} else {
 			return '';
@@ -1120,20 +1178,20 @@ function dwqa_get_mail_template( $option, $name = '' ) {
 function dwqa_vote_best_answer_button() {
 	global $current_user;
 	$question_id = get_post_meta( get_the_ID(), '_question', true );
-	$question = get_post( $question_id );
-		$best_answer = dwqa_get_the_best_answer( $question_id );
-		$data = is_user_logged_in() && ( $current_user->ID == $question->post_author || current_user_can( 'edit_posts' ) ) ? 'data-answer="'.get_the_ID().'" data-nonce="'.wp_create_nonce( '_dwqa_vote_best_answer' ).'" data-ajax="true"' : 'data-ajax="false"';
+	$question    = get_post( $question_id );
+	$best_answer = dwqa_get_the_best_answer( $question_id );
+	$data        = is_user_logged_in() && ( $current_user->ID == $question->post_author || current_user_can( 'edit_posts' ) ) ? 'data-answer="' . get_the_ID() . '" data-nonce="' . wp_create_nonce( '_dwqa_vote_best_answer' ) . '" data-ajax="true"' : 'data-ajax="false"';
 	if ( get_post_status( get_the_ID() ) != 'publish' ) {
 		return false;
 	}
 	if ( $best_answer == get_the_ID() || ( is_user_logged_in() && ( $current_user->ID == $question->post_author || current_user_can( 'edit_posts' ) ) ) ) {
 		?>
-		<div class="entry-vote-best <?php echo $best_answer == get_the_ID() ? 'active' : ''; ?>" <?php echo $data ?> >
-			<a href="javascript:void( 0 );" title="<?php _e( 'Choose as the best answer','dwqa' ) ?>">
-				<div class="entry-vote-best-bg"></div>
-				<i class="icon-thumbs-up"></i>
-			</a>
-		</div>
+        <div class="entry-vote-best <?php echo $best_answer == get_the_ID() ? 'active' : ''; ?>" <?php echo $data ?> >
+            <a href="javascript:void( 0 );" title="<?php _e( 'Choose as the best answer', 'dwqa' ) ?>">
+                <div class="entry-vote-best-bg"></div>
+                <i class="icon-thumbs-up"></i>
+            </a>
+        </div>
 		<?php
 	}
 }

From f6a1508e649f2e32de388e493f4bb57649a5e589 Mon Sep 17 00:00:00 2001
From: Denver Prophit Jr <denver@denverprophit.us>
Date: Fri, 17 Nov 2017 08:08:16 -0500
Subject: [PATCH 3/6] Updates Issue to build schema

Updates /designwall/dw-question-answer/#218 this is the question loop. I changed the stats div to an aside so that indexing doesn't count the content as apart of the main content in SERP results.
---
 templates/content-question.php | 50 +++++++++++++++++++---------------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/templates/content-question.php b/templates/content-question.php
index ae84d12a..d050e174 100644
--- a/templates/content-question.php
+++ b/templates/content-question.php
@@ -7,36 +7,42 @@
  */
 
 ?>
-<div class="<?php echo dwqa_post_class(); ?>">
-	<div class="dwqa-question-title"><a href="<?php the_permalink(); ?>"><?php the_title(); ?></a></div>
-	<div class="dwqa-question-meta">
+<div class="<?php echo dwqa_post_class(); ?>" itemscope itemtype="https://schema.org/Question">
+    <div>
+        <h1 class="dwqa-question-title"><a href="<?php the_permalink(); ?>"><span
+                        itemprop="name headline"><?php the_title(); ?></span></a></h1>
+    </div>
+    <div class="dwqa-question-meta">
 		<?php dwqa_question_print_status() ?>
 		<?php
-			global $post;
-			$user_id = get_post_field( 'post_author', get_the_ID() ) ? get_post_field( 'post_author', get_the_ID() ) : false;
-			$time = human_time_diff( get_post_time( 'U', true ) );
-			$text = __( 'asked', 'dwqa' );
-			$latest_answer = dwqa_get_latest_answer();
-			if ( $latest_answer ) {
-				$time = human_time_diff( strtotime( $latest_answer->post_date_gmt ) );
-				$text = __( 'answered', 'dwqa' );
-			}
+		global $post;
+		$user_id       = get_post_field( 'post_author', get_the_ID() ) ? get_post_field( 'post_author', get_the_ID() ) : false;
+		$time          = human_time_diff( get_post_time( 'U', true ) );
+		$text          = __( 'asked', 'dwqa' );
+		$latest_answer = dwqa_get_latest_answer();
+		if ( $latest_answer ) {
+			$time = human_time_diff( strtotime( $latest_answer->post_date_gmt ) );
+			$text = __( 'answered', 'dwqa' );
+		}
 		?>
-		<?php printf( __( '<span><a href="%s">%s%s</a> %s %s ago</span>', 'dwqa' ), dwqa_get_author_link( $user_id ), get_avatar( $user_id, 48 ), get_the_author(), $text, $time ) ?>
+		<?php printf( __( '<span><a href="%s"><span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">%s%s</span></span></a> %s %s ago</span>', 'dwqa' ), dwqa_get_author_link( $user_id ), get_avatar( $user_id, 48 ), get_the_author(), $text, $time ) ?>
 		<?php echo get_the_term_list( get_the_ID(), 'dwqa-question_category', '<span class="dwqa-question-category">' . __( '&nbsp;&bull;&nbsp;', 'dwqa' ), ', ', '</span>' ); ?>
-	</div>
-	<div class="dwqa-question-stats">
-		<span class="dwqa-views-count">
+    </div>
+    <aside class="dwqa-question-stats">
+		<span class="dwqa-views-count" itemprop="interactionStatistic" itemscope
+              itemtype="https://schema.org/InteractionCounter">
 			<?php $views_count = dwqa_question_views_count() ?>
-			<?php printf( __( '<strong>%1$s</strong> views', 'dwqa' ), $views_count ); ?>
+            <link itemprop="interactionType" href="https://schema.org/ViewAction"/>
+			<?php printf( __( '<span style="border: none;" itemprop="userInteractionCount"><strong>%1$s</strong></span> views', 'dwqa' ), $views_count ); ?>
 		</span>
-		<span class="dwqa-answers-count">
+        <span class="dwqa-answers-count">
 			<?php $answers_count = dwqa_question_answers_count(); ?>
-			<?php printf( __( '<strong>%1$s</strong> answers', 'dwqa' ), $answers_count ); ?>
+			<?php printf( __( '<span style="border: none;" itemprop="answerCount"><strong>%1$s</strong></span> answers', 'dwqa' ), $answers_count ); ?>
 		</span>
-		<span class="dwqa-votes-count">
+        <span class="dwqa-votes-count">
 			<?php $vote_count = dwqa_vote_count() ?>
-			<?php printf( __( '<strong>%1$s</strong> votes', 'dwqa' ), $vote_count ); ?>
+			<?php printf( __( '<span style="border: none;" itemprop="upvoteCount"><strong>%1$s</strong></span> votes', 'dwqa' ), $vote_count ); ?>
 		</span>
-	</div>
+    </aside>
+    <meta itemprop="url" content="<?php the_permalink(); ?>"/>
 </div>

From 4c3b854603eb43325a6f71cf1dd5a88146ab9ff7 Mon Sep 17 00:00:00 2001
From: Denver Prophit Jr <denver@denverprophit.us>
Date: Fri, 17 Nov 2017 08:13:29 -0500
Subject: [PATCH 4/6] Updates content template for schema answer

Updates issue /designwall/dw-question-answer/#218 for answer schema
---
 templates/content-single-answer.php | 51 +++++++++++++++++++----------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/templates/content-single-answer.php b/templates/content-single-answer.php
index dabaaeea..9e913a28 100644
--- a/templates/content-single-answer.php
+++ b/templates/content-single-answer.php
@@ -6,28 +6,43 @@
  * @since DW Question & Answer 1.4.3
  */
 ?>
-<div class="<?php echo dwqa_post_class() ?>">
-	<div class="dwqa-answer-vote" data-nonce="<?php echo wp_create_nonce( '_dwqa_answer_vote_nonce' ) ?>" data-post="<?php the_ID(); ?>">
-		<span class="dwqa-vote-count"><?php echo dwqa_vote_count() ?></span>
-		<a class="dwqa-vote dwqa-vote-up" href="#"><?php _e( 'Vote Up', 'dwqa' ); ?></a>
-		<a class="dwqa-vote dwqa-vote-down" href="#"><?php _e( 'Vote Down', 'dwqa' ); ?></a>
-	</div>
+<div class="<?php echo dwqa_post_class() ?>"
+     itemprop="suggestedAnswer<?php if ( dwqa_is_the_best_answer() ) : ?> acceptedAnswer<?php endif; ?>" itemscope
+     itemtype="http://schema.org/Answer">
+    <aside class="dwqa-answer-vote" data-nonce="<?php echo wp_create_nonce( '_dwqa_answer_vote_nonce' ) ?>"
+           data-post="<?php the_ID(); ?>">
+
+        <span class="dwqa-vote-count" itemprop="upvoteCount"><?php echo dwqa_vote_count() ?></span>
+        <a class="dwqa-vote dwqa-vote-up" href="#"><?php _e( 'Vote Up', 'dwqa' ); ?></a>
+        <a class="dwqa-vote dwqa-vote-down" href="#"><?php _e( 'Vote Down', 'dwqa' ); ?></a>
+
+    </aside>
 	<?php if ( dwqa_current_user_can( 'edit_question', dwqa_get_question_from_answer_id() ) ) : ?>
-		<?php $action = dwqa_is_the_best_answer() ? 'dwqa-unvote-best-answer' : 'dwqa-vote-best-answer' ; ?>
-		<a class="dwqa-pick-best-answer" href="<?php echo esc_url( wp_nonce_url( add_query_arg( array( 'answer' => get_the_ID(), 'action' => $action ), admin_url( 'admin-ajax.php' ) ), '_dwqa_vote_best_answer' ) ) ?>"><?php _e( 'Best Answer', 'dwqa' ) ?></a>
+		<?php $action = dwqa_is_the_best_answer() ? 'dwqa-unvote-best-answer' : 'dwqa-vote-best-answer'; ?>
+        <aside>
+            <a class="dwqa-pick-best-answer" href="<?php echo esc_url( wp_nonce_url( add_query_arg( array(
+				'answer' => get_the_ID(),
+				'action' => $action
+			), admin_url( 'admin-ajax.php' ) ), '_dwqa_vote_best_answer' ) ) ?>"><?php _e( 'Best Answer', 'dwqa' ) ?></a>
+        </aside>
 	<?php elseif ( dwqa_is_the_best_answer() ) : ?>
-		<span class="dwqa-pick-best-answer"><?php _e( 'Best Answer', 'dwqa' ) ?></span>
+        <aside><span class="dwqa-pick-best-answer"><?php _e( 'Best Answer', 'dwqa' ) ?></span></aside>
+
 	<?php endif; ?>
-	<div class="dwqa-answer-meta">
+    <aside class="dwqa-answer-meta">
 		<?php $user_id = get_post_field( 'post_author', get_the_ID() ) ? get_post_field( 'post_author', get_the_ID() ) : 0 ?>
-		<?php printf( __( '<span><a href="%s">%s%s</a> %s answered %s ago</span>', 'dwqa' ), dwqa_get_author_link( $user_id ), get_avatar( $user_id, 48 ), get_the_author(), dwqa_print_user_badge( $user_id ), human_time_diff( get_post_time( 'U', true ) ) ) ?>
+		<?php printf( __( '<span><a href="%s"><span itemprop="author" itemscope itemtype="http://schema.org/Person"><span itemprop="name">%s%s</span></span></a> %s answered %s ago</span>', 'dwqa' ), dwqa_get_author_link( $user_id ), get_avatar( $user_id, 48 ), get_the_author(), dwqa_print_user_badge( $user_id ), human_time_diff( get_post_time( 'U', true ) ) ) ?>
 		<?php if ( 'private' == get_post_status() ) : ?>
-			<span><?php _e( '&nbsp;&bull;&nbsp;', 'dwqa' ); ?></span>
-			<span><?php _e( 'Private', 'dwqa' ) ?></span>
+            <span><?php _e( '&nbsp;&bull;&nbsp;', 'dwqa' ); ?></span>
+            <span><?php _e( 'Private', 'dwqa' ) ?></span>
 		<?php endif; ?>
-		<span class="dwqa-answer-actions"><?php dwqa_answer_button_action(); ?></span>
-	</div>
-	<div class="dwqa-answer-content"><?php the_content(); ?></div>
-	<?php do_action('dwqa_after_show_content_answer', get_the_ID()); ?>
-	<?php comments_template(); ?>
+        <span class="dwqa-answer-actions"><?php dwqa_answer_button_action(); ?></span>
+    </aside>
+    <span class="dwqa-answer-content" itemprop="text"><?php the_content(); ?>
+</span>
 </div>
+<?php do_action( 'dwqa_after_show_content_answer', get_the_ID() ); ?>
+<?php comments_template(); ?>
+</div>
+
+<!-- TODO Add parentItem schema attribute -->

From 9d261f18b0fc6fc274c913ccc93b7bafce4f0113 Mon Sep 17 00:00:00 2001
From: Denver Prophit Jr <denver@denverprophit.us>
Date: Fri, 17 Nov 2017 08:21:17 -0500
Subject: [PATCH 5/6] Updates schema question structured data

Updates issue /designwall/dw-question-answer/#218 with a **TODO** of fixing line 16 with the value of cpt category title as audience type is a text value at schema.org

I changed to HTML5 `<footer>` around line 36
---
 templates/content-single-question.php | 64 +++++++++++++++++----------
 1 file changed, 41 insertions(+), 23 deletions(-)

diff --git a/templates/content-single-question.php b/templates/content-single-question.php
index 0009f334..ba826987 100644
--- a/templates/content-single-question.php
+++ b/templates/content-single-question.php
@@ -8,40 +8,58 @@
 ?>
 
 <?php do_action( 'dwqa_before_single_question_content' ); ?>
-<div class="dwqa-question-item">
-	<div class="dwqa-question-vote" data-nonce="<?php echo wp_create_nonce( '_dwqa_question_vote_nonce' ) ?>" data-post="<?php the_ID(); ?>">
-		<span class="dwqa-vote-count"><?php echo dwqa_vote_count() ?></span>
-		<a class="dwqa-vote dwqa-vote-up" href="#"><?php _e( 'Vote Up', 'dwqa' ); ?></a>
-		<a class="dwqa-vote dwqa-vote-down" href="#"><?php _e( 'Vote Down', 'dwqa' ); ?></a>
-	</div>
-	<div class="dwqa-question-meta">
+<div itemscope itemtype="https://schema.org/AskAction">
+    <link itemprop="question" href="#dwqa-question-item"/>
+    <link itemprop="agent" href="#agent"/>
+    <meta itemprop="inLanguage" content="<?php bloginfo( 'language' ); ?>"/>
+    <div itemprop="recipient" itemscope itemtype="http://schema.org/Audience">
+        <meta itemprop="audienceType" content="<?php echo single_cat_title( "", false ); ?>"/>
+    </div>
+</div>
+<article itemid="#dwqa-question-item" id="dwqa-question-item" class="dwqa-question-item" itemscope
+         itemtype="https://schema.org/Question">
+    <meta itemprop="name headline" content="<?php post_type_archive_title(); ?>"/>
+    <meta itemprop="url" content="<?php the_permalink(); ?>"/>
+    <div class="dwqa-question-vote" data-nonce="<?php echo wp_create_nonce( '_dwqa_question_vote_nonce' ) ?>"
+         data-post="<?php the_ID(); ?>">
+        <span class="dwqa-vote-count" itemprop="upvoteCount"><?php echo dwqa_vote_count() ?></span>
+        <a class="dwqa-vote dwqa-vote-up" href="#"><?php _e( 'Vote Up', 'dwqa' ); ?></a>
+        <a class="dwqa-vote dwqa-vote-down" href="#"><?php _e( 'Vote Down', 'dwqa' ); ?></a>
+    </div>
+    <div class="dwqa-question-meta">
 		<?php $user_id = get_post_field( 'post_author', get_the_ID() ) ? get_post_field( 'post_author', get_the_ID() ) : false ?>
-		<?php printf( __( '<span><a href="%s">%s%s</a> %s asked %s ago</span>', 'dwqa' ), dwqa_get_author_link( $user_id ), get_avatar( $user_id, 48 ), get_the_author(),  dwqa_print_user_badge( $user_id ), human_time_diff( get_post_time( 'U', true ) ) ) ?>
-		<span class="dwqa-question-actions"><?php dwqa_question_button_action() ?></span>
-	</div>
-	<div class="dwqa-question-content"><?php the_content(); ?></div>
-	<?php do_action('dwqa_after_show_content_question', get_the_ID()); ?>
-	<div class="dwqa-question-footer">
-		<div class="dwqa-question-meta">
+	    <?php printf( __( '<span><a href="%s"><span itemid="#agent" itemprop="author" itemscope itemtype="https://schema.org/Person"><span itemprop="name">%s%s</span></span></a> %s asked %s ago</span>', 'dwqa' ), dwqa_get_author_link( $user_id ), get_avatar( $user_id, 48 ), get_the_author(), dwqa_print_user_badge( $user_id ), human_time_diff( get_post_time( 'U', true ) ) ) ?>
+        <span class="dwqa-question-actions"><?php dwqa_question_button_action() ?></span>
+    </div>
+    <div class="dwqa-question-content" itemprop="text"><?php the_content(); ?></div>
+	<?php do_action( 'dwqa_after_show_content_question', get_the_ID() ); ?>
+    <footer class="dwqa-question-footer">
+        <div class="dwqa-question-meta">
 			<?php echo get_the_term_list( get_the_ID(), 'dwqa-question_tag', '<span class="dwqa-question-tag">' . __( 'Question Tags: ', 'dwqa' ), ', ', '</span>' ); ?>
 			<?php if ( dwqa_current_user_can( 'edit_question', get_the_ID() ) ) : ?>
 				<?php if ( dwqa_is_enable_status() ) : ?>
-				<span class="dwqa-question-status">
+                    <span class="dwqa-question-status">
 					<?php _e( 'This question is:', 'dwqa' ) ?>
-					<select id="dwqa-question-status" data-nonce="<?php echo wp_create_nonce( '_dwqa_update_privacy_nonce' ) ?>" data-post="<?php the_ID(); ?>">
+                        <select id="dwqa-question-status"
+                                data-nonce="<?php echo wp_create_nonce( '_dwqa_update_privacy_nonce' ) ?>"
+                                data-post="<?php the_ID(); ?>">
 						<optgroup label="<?php _e( 'Status', 'dwqa' ); ?>">
-							<option <?php selected( dwqa_question_status(), 'open' ) ?> value="open"><?php _e( 'Open', 'dwqa' ) ?></option>
-							<option <?php selected( dwqa_question_status(), 'closed' ) ?> value="close"><?php _e( 'Closed', 'dwqa' ) ?></option>
-							<option <?php selected( dwqa_question_status(), 'resolved' ) ?> value="resolved"><?php _e( 'Resolved', 'dwqa' ) ?></option>
+							<option <?php selected( dwqa_question_status(), 'open' ) ?>
+                                    value="open"><?php _e( 'Open', 'dwqa' ) ?></option>
+							<option <?php selected( dwqa_question_status(), 'closed' ) ?>
+                                    value="close"><?php _e( 'Closed', 'dwqa' ) ?></option>
+							<option <?php selected( dwqa_question_status(), 'resolved' ) ?>
+                                    value="resolved"><?php _e( 'Resolved', 'dwqa' ) ?></option>
 						</optgroup>
 					</select>
 					</span>
 				<?php endif; ?>
 			<?php endif; ?>
-		</div>
-	</div>
+        </div>
+    </footer>
 	<?php do_action( 'dwqa_before_single_question_comment' ) ?>
 	<?php comments_template(); ?>
 	<?php do_action( 'dwqa_after_single_question_comment' ) ?>
-</div>
-<?php do_action( 'dwqa_after_single_question_content' ); ?>
+
+	<?php do_action( 'dwqa_after_single_question_content' ); ?>
+// TODO Line 16 Audience Type from category title

From 04e95f9e813dc7b1e1a0e5427017cc26ddd3093a Mon Sep 17 00:00:00 2001
From: Denver Prophit Jr <denver@denverprophit.us>
Date: Fri, 17 Nov 2017 08:27:04 -0500
Subject: [PATCH 6/6] Adds H1 tag for HTML5 outline

Fixes Issue /designwall/dw-question-answer/#219 by adding H1 tag.
---
 templates/archive-question.php | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/templates/archive-question.php b/templates/archive-question.php
index 800f51d2..fa557a00 100644
--- a/templates/archive-question.php
+++ b/templates/archive-question.php
@@ -8,8 +8,8 @@
 ?>
 <div class="dwqa-questions-archive">
 	<?php do_action( 'dwqa_before_questions_archive' ) ?>
-
-		<div class="dwqa-questions-list">
+    <h1><?php echo single_cat_title( "", false ); ?></h1>
+    <div class="dwqa-questions-list">
 		<?php do_action( 'dwqa_before_questions_list' ) ?>
 		<?php if ( dwqa_has_question() ) : ?>
 			<?php while ( dwqa_has_question() ) : dwqa_the_question(); ?>
@@ -21,13 +21,14 @@
 			<?php dwqa_load_template( 'content', 'none' ) ?>
 		<?php endif; ?>
 		<?php do_action( 'dwqa_after_questions_list' ) ?>
-		</div>
-		<div class="dwqa-questions-footer">
-			<?php dwqa_question_paginate_link() ?>
-			<?php if ( dwqa_current_user_can( 'post_question' ) ) : ?>
-				<div class="dwqa-ask-question"><a href="<?php echo dwqa_get_ask_link(); ?>"><?php _e( 'Ask Question', 'dwqa' ); ?></a></div>
-			<?php endif; ?>
-		</div>
+    </div>
+    <footer class="dwqa-questions-footer">
+		<?php dwqa_question_paginate_link() ?>
+		<?php if ( dwqa_current_user_can( 'post_question' ) ) : ?>
+            <div class="dwqa-ask-question"><a
+                        href="<?php echo dwqa_get_ask_link(); ?>"><?php _e( 'Ask Question', 'dwqa' ); ?></a></div>
+		<?php endif; ?>
+    </footer>
 
 	<?php do_action( 'dwqa_after_questions_archive' ); ?>
 </div>