From 4686b80f96953e576844e563cd7f140723a01dd4 Mon Sep 17 00:00:00 2001
From: Ken Newman <wraithkenny@unfocus.com>
Date: Fri, 29 May 2015 00:46:45 -0400
Subject: [PATCH] 3.3.1

a couple bug fixes
---
 includes/class-sns-ajax.php     | 1 +
 includes/class-sns-meta-box.php | 1 +
 js/meta-box.js                  | 8 ++++----
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/includes/class-sns-ajax.php b/includes/class-sns-ajax.php
index 8b86b52..df67c4c 100644
--- a/includes/class-sns-ajax.php
+++ b/includes/class-sns-ajax.php
@@ -398,6 +398,7 @@ static function shortcodes() {
 
 	// Differs from SnS_Admin_Meta_Box::maybe_set() in that this needs no prefix.
 	static function maybe_set( $o, $i ) {
+		if ( ! is_array( $o ) ) return array();
 		if ( empty( $_REQUEST[ $i ] ) ) {
 			if ( isset( $o[ $i ] ) ) unset( $o[ $i ] );
 		} else $o[ $i ] = $_REQUEST[ $i ];
diff --git a/includes/class-sns-meta-box.php b/includes/class-sns-meta-box.php
index f398e55..5dd832d 100644
--- a/includes/class-sns-meta-box.php
+++ b/includes/class-sns-meta-box.php
@@ -409,6 +409,7 @@ static function save_post( $post_id ) {
 	 * Filters $o and Checks if the sent data $i is empty (intended to clear). If not, updates.
 	 */
 	static function maybe_set( $o, $i, $p = 'SnS_' ) {
+		if ( ! is_array( $o ) ) return array();
 		if ( empty( $_REQUEST[ $p . $i ] ) ) {
 			if ( isset( $o[ $i ] ) ) unset( $o[ $i ] );
 		} else {
diff --git a/js/meta-box.js b/js/meta-box.js
index 3b924ee..878828a 100644
--- a/js/meta-box.js
+++ b/js/meta-box.js
@@ -483,15 +483,15 @@ jQuery( document ).ready( function( $ ) {
 				}
 				initData.style_formats = style_formats;
 
-				if ( initData.theme_advanced_buttons2.indexOf( "styleselect" ) == -1 ) {
+				if ( initData.toolbar2.indexOf( "styleselect" ) == -1 ) {
 					var tempString = "styleselect,";
-					initData.theme_advanced_buttons2 = tempString.concat(initData.theme_advanced_buttons2);
+					initData.toolbar2 = tempString.concat(initData.toolbar2);
 				}
 
 				$( '#delete-mce-dropdown-names', context ).show();
 			} else {
 				delete initData.style_formats;
-				initData.theme_advanced_buttons2 = initData.theme_advanced_buttons2.replace("styleselect,", "");
+				initData.toolbar2 = initData.toolbar2.replace("styleselect,", "");
 
 				$( '#delete-mce-dropdown-names', context ).hide();
 			}
@@ -580,7 +580,7 @@ jQuery( document ).ready( function( $ ) {
 		ed.remove();
 		if ( initDatas[ed.id] && initDatas[ed.id].wpautop )
 			$('#'+ed.id).val( switchEditors.wpautop( $('#'+ed.id).val() ) );
-		ed = new tinymce.Editor( ed.id, initDatas[ed.id] );
+		ed = new tinymce.Editor( ed.id, initDatas[ed.id], tinymce.EditorManager );
 		ed.render();
 		ed.hide();
 	}