Merge branch 'release/2.5.3'

inc/admin-layouts.php

@@ -134,7 +134,8 @@ function action_get_prebuilt_layouts() {
 						$item['type']       = $type;
 
 						if( empty( $item['screenshot'] ) && ! empty( $item['preview'] ) ) {
-							$item['screenshot'] = 'https://s.wordpress.com/mshots/v1/' . urlencode( $item[ 'preview' ] ) . '?w=700';
+							$preview_url = add_query_arg( 'screenshot', 'true', $item[ 'preview' ] );
+							$item['screenshot'] = 'https://s.wordpress.com/mshots/v1/' . urlencode( $preview_url ) . '?w=700';
 						}
 
 						$return['items'][]  = $item;

inc/admin.php

@@ -86,11 +86,12 @@ public function admin_init(){
 				}
 			}
 		}
-
+		
 		if( self::is_admin() ) {
-			// Setup everything for Page Builder learning
+			// Setup everything for Page Builder learning as long as we're viewing a Page Builder page
 			SiteOrigin_Learn_Dialog::single();
 			add_filter( 'siteorigin_learn_lessons', array( $this, 'filter_learn_lessons' ) );
+			add_filter( 'siteorigin_learn_strings', array( $this, 'filter_learn_strings' ), 99 );
 		}
 	}
 
@@ -1018,5 +1019,26 @@ public function filter_learn_lessons( $lessons ) {
 
 		return $lessons;
 	}
+
+	/**
+	 * Filter the translation strings for SiteOrigin learning dialogs
+	 *
+	 * @param $strings
+	 *
+	 * @return array
+	 */
+	public function filter_learn_strings( $strings ){
+		$strings = array(
+			'watch_video' => __( 'Watch Intro Video', 'siteorigin-panels' ),
+			'loaded_from_vimeo' => __( 'Loaded from Vimeo Servers', 'siteorigin-panels' ),
+			'valid_email' => __( 'Please enter a valid email address.', 'siteorigin-panels' ),
+
+			'your_name' => __( 'Your Name', 'siteorigin-panels' ),
+			'your_email' => __( 'Your Email', 'siteorigin-panels' ),
+			'sign_up' => __( 'Sign Up', 'siteorigin-panels' ),
+			'close' => __( 'Close', 'siteorigin-panels' ),
+		);
+		return $strings;
+	}
 
 }

inc/functions.php

@@ -41,6 +41,17 @@ function siteorigin_panels_render( $post_id = false, $enqueue_css = true, $panel
 	return SiteOrigin_Panels::renderer()->render( $post_id, $enqueue_css, $panels_data );
 }
 
+/**
+ * Generate the CSS for the page layout.
+ *
+ * @param $post_id
+ * @param $panels_data
+ * @return string
+ */
+function siteorigin_panels_generate_css($post_id, $panels_data = false){
+	return SiteOrigin_Panels::renderer()->generate_css( $post_id, $panels_data );
+}
+
 /**
  * Legacy function to process raw widgets.
  *

inc/styles.php

@@ -334,7 +334,10 @@ static function widget_style_fields( $fields ) {
 	 */
 	static function general_style_attributes( $attributes, $style ){
 		if ( ! empty( $style['class'] ) ) {
-			$attributes['class'] = array_merge( $attributes['class'], explode( ' ', $style['class'] ) );
+			if( ! is_array( $style['class'] ) ) {
+				$style['class'] = explode( ' ', $style[ 'class' ] );
+			}
+			$attributes['class'] = array_merge( $attributes['class'], $style['class'] );
 		}
 
 		if ( ! empty( $style['background_display'] ) && ! empty( $style['background_image_attachment'] ) ) {

inc/widget-shortcode.php

@@ -97,8 +97,10 @@ static function get_shortcode( $widget, $args, $instance ){
 	 */
 	static function widget_html( $html, $widget, $args, $instance ){
 		if(
+			empty( $GLOBALS[ 'SITEORIGIN_PANELS_CACHE_RENDER' ] ) ||
 			// Don't try create HTML if there already is some
 			! empty( $html ) ||
+			! is_object( $widget ) ||
 			// Skip for known text based widgets
 			in_array( get_class( $widget ), self::$text_widgets )
 		) {

readme.txt

@@ -96,6 +96,12 @@ We've tried to ensure that Page Builder is compatible with most plugin widgets.
 
 == Changelog ==
 
+= 2.5.3 - 9 May 2017 =
+* Added legacy function wrapper for siteorigin_panels_generate_css
+* Added more cache render checks
+* Handle translation of Learn submodule strings
+* Added screenshot argument to preview URL
+
 = 2.5.2 - 19 April 2017 =
 * Fixed RTL layouts for new flexbox layout.
 * Renamed front.css to ensure cache busting.