Merge branch '2.x' into feature/#3967

pods-framework · Mar 2, 2017 · d7ccf55 · d7ccf55
2 parents c5031ae + 4403976
commit d7ccf55
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/includes/general.php b/includes/general.php
@@ -725,7 +725,7 @@ function pods_shortcode ( $tags, $content = null ) {
 		$return = '';
 
 		if ( !file_exists( $tags[ 'view' ] ) ) {
-			$return = pods_view( $tags[ 'view' ], null, (int) $tags[ 'expires' ], $tags[ 'cache_mode' ] );
+			$return = pods_view( $tags[ 'view' ], null, (int) $tags[ 'expires' ], $tags[ 'cache_mode' ], true );
 
 			if ( $tags[ 'shortcodes' ] && defined( 'PODS_SHORTCODE_ALLOW_SUB_SHORTCODES' ) && PODS_SHORTCODE_ALLOW_SUB_SHORTCODES ) {
 				$return = do_shortcode( $return );

diff --git a/ui/fields/currency.php b/ui/fields/currency.php
@@ -33,7 +33,7 @@
 if ( isset( PodsField_Currency::$currencies[ pods_var( 'currency_format_sign', $options, -1 ) ] ) )
     $currency = pods_var( 'currency_format_sign', $options );
 
-$currency_sign = PodsField_Currency::$currencies[ $currency ];
+$currency_sign = PodsField_Currency::$currencies[ $currency ]['sign'];
 ?>
 <input<?php PodsForm::attributes( $attributes, $name, $form_field_type, $options ); ?>/>
 <script>