Merge branch 'release/1.2.1'

Author: gregpriday

README.md

@@ -52,14 +52,17 @@ Font created using Icomoon - http://icomoon.io
 Change Log
 ---------------
 
+####1.2.1 - 30 May 2016
+* Fixed compatibility with Influence Plus.
+
 ####1.2 - 30 May 2016
 * Updated to latest settings framework.
 * Moved settings into Customizer with legacy note.
 * Removed unused settings.
 * Added design customization settings.
 * Improved retina logo setting.
 * Use new WordPress title tag.
-* Removed extras folder and unsued libraries.
+* Removed extras folder and unused libraries.
 
 ####1.1.1
 * Properly center meta slider in header

functions.php

@@ -13,7 +13,11 @@
 // Include all the SiteOrigin extras
 include get_template_directory() . '/inc/webfonts/webfonts.php';
 include get_template_directory() . '/inc/settings/settings.php';
-include get_template_directory() . '/inc/customizer/customizer.php';
+
+if( ! function_exists( 'influence_plus_init' ) ) {
+	include get_template_directory() . '/inc/customizer/customizer.php';
+	include get_template_directory() . '/inc/customizer.php';
+}
 
 // Load the theme specific files
 include get_template_directory() . '/inc/slider.php';
@@ -22,7 +26,6 @@
 include get_template_directory() . '/inc/extras.php';
 include get_template_directory() . '/inc/template-tags.php';
 include get_template_directory() . '/inc/formats.php';
-include get_template_directory() . '/inc/customizer.php';
 
 include get_template_directory() . '/inc/legacy.php';
 

inc/legacy.php

@@ -5,7 +5,7 @@ function influence_add_legacy_settings_page(){
 		__( 'Theme Settings', 'influence' ),
 		__( 'Theme Settings', 'influence' ),
 		'manage_options',
-		'origami-legacy-settings',
+		'influence-legacy-settings',
 		'influence_legacy_settings_page'
 	);
 }
@@ -21,4 +21,16 @@ function influence_legacy_settings_page(){
 		</p>
 	</div>
 	<?php
+}
+
+if( !function_exists( 'siteorigin_settings_add_field' ) ) {
+	function siteorigin_settings_add_field( $section, $id, $type, $label = null, $args = array(), $after = false ){
+		SiteOrigin_Settings::single()->add_field( $section, $id, $type, $label, $args, $after);
+	}
+}
+
+if( !function_exists( 'siteorigin_settings_add_section' ) ) {
+	function siteorigin_settings_add_section( $id, $title, $after = false ){
+		SiteOrigin_Settings::single()->add_section( $id, $title, $after );
+	}
 }