Merge branch 'hotfix/v2.3.1'

Author: ajaydsouza

LICENSE.txt

@@ -235,12 +235,12 @@ public function set_translation_strings( $strings ) {
 		// Args prefixed with an underscore are reserved for internal use.
 		$defaults = array(
 			'page_header'          => '',
-			'reset_message'        => __( 'Settings have been reset to their default values. Reload this page to view the updated settings.' ),
-			'success_message'      => __( 'Settings updated.' ),
-			'save_changes'         => __( 'Save Changes' ),
-			'reset_settings'       => __( 'Reset all settings' ),
-			'reset_button_confirm' => __( 'Do you really want to reset all these settings to their default values?' ),
-			'checkbox_modified'    => __( 'Modified from default setting' ),
+			'reset_message'        => 'Settings have been reset to their default values. Reload this page to view the updated settings.',
+			'success_message'      => 'Settings updated.',
+			'save_changes'         => 'Save Changes',
+			'reset_settings'       => 'Reset all settings',
+			'reset_button_confirm' => 'Do you really want to reset all these settings to their default values?',
+			'checkbox_modified'    => 'Modified from default setting',
 		);
 
 		$strings = wp_parse_args( $strings, $defaults );
@@ -471,7 +471,7 @@ public function admin_enqueue_scripts( $hook ) {
 		);
 		wp_register_script(
 			'wz-' . $this->prefix . '-codemirror',
-			plugins_url( 'js/apply-codemirror' . $minimize . '.js', __FILE__ ),
+			plugins_url( 'js/apply-cm' . $minimize . '.js', __FILE__ ),
 			array( 'jquery' ),
 			self::VERSION,
 			true

includes/admin/settings/class-settings-api.php

@@ -144,7 +144,7 @@ protected function get_field_attributes( $args ) {
 	 */
 	public function callback_missing( $args ) {
 		/* translators: 1: Code. */
-		printf( esc_html__( 'The callback function used for the %1$s setting is missing.' ), '<strong>' . esc_attr( $args['id'] ) . '</strong>' );
+		printf( 'The callback function used for the %1$s setting is missing.', '<strong>' . esc_attr( $args['id'] ) . '</strong>' );
 	}
 
 	/**
@@ -514,7 +514,7 @@ public function callback_thumbsizes( $args ) {
 				$name,
 				(int) $option['width'],
 				(int) $option['height'],
-				(bool) $option['crop'] ? ' ' . __( 'cropped' ) : ''
+				(bool) $option['crop'] ? ' cropped' : ''
 			);
 		}
 
@@ -748,7 +748,7 @@ public function callback_file( $args ) {
 		$value = isset( $args['value'] ) ? $args['value'] : $this->get_option( $args['id'], $args['options'] );
 		$size  = sanitize_html_class( isset( $args['size'] ) ? $args['size'] : 'regular' );
 		$class = sanitize_html_class( $args['field_class'] );
-		$label = isset( $args['options']['button_label'] ) ? $args['options']['button_label'] : __( 'Choose File' );
+		$label = isset( $args['options']['button_label'] ) ? $args['options']['button_label'] : 'Choose File';
 
 		$html  = sprintf(
 			'<input type="text" class="%1$s" id="%2$s[%3$s]" name="%2$s[%3$s]" value="%4$s"/>',

includes/admin/settings/class-settings-form.php

@@ -192,8 +192,16 @@ private static function get_hierarchical_term_trail_array( \WP_Term $taxonomy, $
 		$defaults = array(
 			'separator' => '»',
 		);
-		$args     = wp_parse_args( $args, $defaults );
-		$trail    = array();
+
+		$args = wp_parse_args( $args, $defaults );
+
+		$output  = '<li class="wzkb_breadcrumb-item" data-separator="' . esc_attr( $args['separator'] ) . '" itemprop="itemListElement" itemscope itemtype="https://schema.org/ListItem">';
+		$output .= '<a href="' . esc_url( get_term_link( $taxonomy ) ) . '" itemprop="item" title="' . esc_attr( $taxonomy->name ) . '">';
+		$output .= '<span itemprop="name">' . esc_html( $taxonomy->name ) . '</span>';
+		$output .= '</a>';
+		$output .= '<meta itemprop="position" content="' . intval( $position ) . '" />';
+		$output .= '</li>';
+
 		if ( ! empty( $taxonomy->parent ) ) {
 			$trail     = array_merge(
 				self::get_hierarchical_term_trail_array(

…es/admin/settings/js/apply-codemirror.js includes/admin/settings/js/apply-cm.jsincludes/admin/settings/js/apply-codemirror.js renamed to includes/admin/settings/js/apply-cm.js includes/admin/settings/js/apply-codemirror.js renamed to includes/admin/settings/js/apply-cm.js

@@ -34,7 +34,7 @@
 
 				// If no content, include the "No posts found" template.
 			else :
-				esc_html_e( 'No results found', 'wzkb' );
+				esc_html_e( 'No results found', 'knowledgebase' );
 
 			endif;
 			?>
@@ -50,5 +50,3 @@
 
 <?php
 get_footer();
-
-

…dmin/settings/js/apply-codemirror.min.js …cludes/admin/settings/js/apply-cm.min.jsincludes/admin/settings/js/apply-codemirror.min.js renamed to includes/admin/settings/js/apply-cm.min.js includes/admin/settings/js/apply-codemirror.min.js renamed to includes/admin/settings/js/apply-cm.min.js

@@ -108,7 +108,7 @@ function wzkb_get_alert( $args = array(), $content = '' ) {
 	$args = wp_parse_args( $args, $defaults );
 	$args = Helpers::sanitize_args( $args );
 
-	$type = 'wzkb-alert-' . $args['type'];
+	$type = 'wzkb-alert-' . sanitize_html_class( $args['type'] );
 
 	$class = implode( ' ', explode( ',', $args['class'] ) );
 	$class = $type . ' ' . $class;
@@ -166,6 +166,7 @@ function wzkb_get_the_post_thumbnail( $args = array() ) {
 
 	// Parse incomming $args into an array and merge it with $defaults.
 	$args = wp_parse_args( $args, $defaults );
+	$args = Helpers::sanitize_args( $args );
 
 	return Media_Handler::get_the_post_thumbnail( $args );
 }
@@ -185,6 +186,7 @@ function wzkb_related_articles( $args = array() ) {
 	);
 
 	$args = wp_parse_args( $args, $defaults );
+	$args = Helpers::sanitize_args( $args );
 
 	$related = Related::get_related_articles( $args );
 

includes/frontend/class-breadcrumbs.php

@@ -147,7 +147,7 @@ function wz_tag_search() {
 
 		$s = isset( $_REQUEST['q'] ) ? sanitize_text_field( wp_unslash( $_REQUEST['q'] ) ) : ''; // phpcs:ignore WordPress.Security.NonceVerification.Recommended
 
-		$comma = _x( ',', 'tag delimiter' );
+		$comma = _x( ',', 'tag delimiter', 'knowledgebase' );
 		if ( ',' !== $comma ) {
 			$s = str_replace( $comma, ',', $s );
 		}

includes/frontend/templates/archive-wz_knowledgebase.php

@@ -48,15 +48,26 @@ public static function get_credit_link() {
 	/**
 	 * Sanitize args.
 	 *
-	 * @since 3.0.0
+	 * @since 2.3.1
 	 *
 	 * @param array $args Array of arguments.
 	 * @return array Sanitized array of arguments.
 	 */
 	public static function sanitize_args( $args ): array {
 		foreach ( $args as $key => $value ) {
 			if ( is_string( $value ) ) {
-				$args[ $key ] = wp_kses_post( $value );
+				switch ( $key ) {
+					case 'class':
+					case 'className':
+					case 'extra_class':
+						$classes           = explode( ' ', $value );
+						$sanitized_classes = array_map( 'sanitize_html_class', $classes );
+						$args[ $key ]      = implode( ' ', $sanitized_classes );
+						break;
+					default:
+						$args[ $key ] = wp_kses_post( $value );
+						break;
+				}
 			}
 		}
 		return $args;