Don't encode shortcode contents on (un)trash. Props Andrew Ozz (@azaozz).

Author: Viper007Bond

readme.txt

@@ -58,6 +58,7 @@ Make sure your theme's `footer.php` file has `<?php wp_footer(); ?>` somewhere i
 = Version 3.1.13 =
 
 * Fix setting sanitization bug. Props Alexander Concha (@xknown).
+* Don't encode shortcode contents on (un)trash. Props Andrew Ozz (@azaozz).
 
 = Version 3.1.12 =
 

syntaxhighlighter.php

@@ -406,13 +406,16 @@ function encode_shortcode_contents_slashed_noquickedit( $content ) {
 		// In certain weird circumstances, the content gets run through "content_save_pre" twice
 		// Keep track and don't allow this filter to be run twice
 		// I couldn't easily figure out why this happens and didn't bother looking into it further as this works fine
-		if ( true == $this->content_save_pre_ran )
+		if ( true == $this->content_save_pre_ran ) {
 			return $content;
+		}
 		$this->content_save_pre_ran = true;
 
 		// Post quick edits aren't decoded for display, so we don't need to encode them (again)
-		if ( ! empty( $_POST ) && !empty( $_POST['action'] ) && 'inline-save' == $_POST['action'] )
+		// This also aborts for (un)trashing to avoid extra encoding.
+		if ( empty( $_POST ) || ( ! empty( $_POST['action'] ) && 'inline-save' == $_POST['action'] ) ) {
 			return $content;
+		}
 
 		return $this->encode_shortcode_contents_slashed( $content );
 	}