Fixes some undefined index issues when using the the_advanced_excerpt…

…() function
archon810 · May 28, 2014 · 6d45fe8 · 6d45fe8
1 parent 95d3bdc
commit 6d45fe8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/class/advanced-excerpt.php b/class/advanced-excerpt.php
@@ -237,11 +237,11 @@ function filter( $text ) {
 		$original_post_content = $text;
 
 		// Determine allowed tags
-		if ( !isset( $allowed_tags ) ) {
+		if ( empty( $allowed_tags ) ) {
 			$allowed_tags = $this->options_all_tags;
 		}
 
-		if ( isset( $exclude_tags ) ) {
+		if ( ! empty( $exclude_tags ) ) {
 			$allowed_tags = array_diff( $allowed_tags, $exclude_tags );
 		}
 

diff --git a/functions/functions.php b/functions/functions.php
@@ -50,8 +50,16 @@ function the_advanced_excerpt( $args = '', $get = false ) {
 		unset( $args['finish_sentence'] );
 	}
 
+	if ( ! empty( $args['allowed_tags'] ) || ! empty( $args['exclude_tags'] ) ) {
+		if ( isset( $args['allowed_tags'] ) && ! in_array( '_all', (array) $args['allowed_tags'] ) ) {
+			$args['allowed_tags_option'] = 'remove_all_tags_except';
+		} else if ( ! isset( $args['allowed_tags'] ) ) {
+			$args['allowed_tags_option'] = 'remove_all_tags_except';
+		}
+	}
+
 	// Set temporary options
-	$advanced_excerpt->options = $args;
+	$advanced_excerpt->options = wp_parse_args( $args, $advanced_excerpt->default_options );
 
 	if ( $get ) {
 		return get_the_excerpt();