Merge pull request #41 from pad52/master

puikinsh · web-flow · commit 369b2df73442 · 2016-09-07T12:54:17.000+03:00
Added condition to avoid conflicts between TGMPA plugins
diff --git a/inc/class-tgm-plugin-activation.php b/inc/class-tgm-plugin-activation.php
@@ -1924,6 +1924,7 @@ function load_tgm_plugin_activation() {
 	 * @param array $plugins An array of plugin arrays.
 	 * @param array $config  Optional. An array of configuration values.
 	 */
+	if ( ! function_exists('tgmpa') ) {
 	function tgmpa( $plugins, $config = array() ) {
 		$instance = call_user_func( array( get_class( $GLOBALS['shapely'] ), 'get_instance' ) );
 
@@ -1950,6 +1951,7 @@ function tgmpa( $plugins, $config = array() ) {
 			call_user_func( array( $instance, 'config' ), $config );
 		}
 	}
+	}
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -1924,6 +1924,7 @@ function load_tgm_plugin_activation() {`
`1924`	`1924`	`* @param array $plugins An array of plugin arrays.`
`1925`	`1925`	`* @param array $config Optional. An array of configuration values.`
`1926`	`1926`	`*/`
	`1927`	`+ if ( ! function_exists('tgmpa') ) {`
`1927`	`1928`	`function tgmpa( $plugins, $config = array() ) {`
`1928`	`1929`	`$instance = call_user_func( array( get_class( $GLOBALS['shapely'] ), 'get_instance' ) );`
`1929`	`1930`
`@@ -1950,6 +1951,7 @@ function tgmpa( $plugins, $config = array() ) {`
`1950`	`1951`	`call_user_func( array( $instance, 'config' ), $config );`
`1951`	`1952`	`}`
`1952`	`1953`	`}`
	`1954`	`+ }`
`1953`	`1955`	`}`
`1954`	`1956`
`1955`	`1957`	`/**`