version 1.1.2 prevents conflicts with other instances of pwp

podlove-web-player/podlove-web-player.php

@@ -1,15 +1,15 @@
 <?php
 /**
  * @package PodloveWebPlayer
- * @version 1.1.1
+ * @version 1.1.2
  */
 
 /*
 Plugin Name: Podlove Web Player
 Plugin URI: http://podlove.org/podlove-web-player/
 Description: Video and audio plugin for WordPress built on the MediaElement.js HTML5 media player library.
 Author: Gerrit van Aaken and others
-Version: 1.1.1
+Version: 1.1.2
 Author URI: http://praegnanz.de
 License: GPLv3, MIT
 */
@@ -19,6 +19,11 @@
 which was adapted from: http://videojs.com/ plugin
 */
 
+
+/* Prevent conflicts with already running versions of PWP */
+
+if (!function_exists(podlove_pwp_install)) {
+
 $podlovePlayerIndex = 1;
 
 define('PODLOVEWEBPLAYER_DIR', plugin_dir_url(__FILE__));
@@ -27,6 +32,7 @@
 
 /* Runs when plugin is activated */
 
+
 function podlove_pwp_install() {
 	add_option('pwp_video_skin', '');
 	add_option('pwp_script_on_demand', false);
@@ -98,7 +104,7 @@ function podlove_pwp_add_scripts() {
 			// the scripts
 			wp_enqueue_script('mediaelementjs-scripts', PODLOVEWEBPLAYER_MEJS_DIR . 'mediaelement-and-player.min.js', array('jquery'), '2.9.1', false);
 			wp_enqueue_script('ba-hashchange', PODLOVEWEBPLAYER_DIR . 'libs/jquery.ba-hashchange.min.js', array('jquery'), '1.3.0', false);
-			wp_enqueue_script('podlove-web-player', PODLOVEWEBPLAYER_DIR . 'podlove-web-player.js', array('jquery', 'mediaelementjs-scripts'), '1.1.1', false);
+			wp_enqueue_script('podlove-web-player', PODLOVEWEBPLAYER_DIR . 'podlove-web-player.js', array('jquery', 'mediaelementjs-scripts'), '1.1.2', false);
 		}
 	}
 	add_action('wp_print_scripts', 'podlove_pwp_add_scripts');
@@ -466,4 +472,6 @@ function podlove_pwp_init() {
 
 add_action('init', 'podlove_pwp_init');
 
+} // End of code
+
 ?>

podlove-web-player/readme.txt

@@ -4,7 +4,7 @@ Donate link: http://podlove.org/
 Tags: podcasting, podlove, html5audio, audio, video, podcast, player
 Requires at least: 3.4.0
 Tested up to: 3.4.1
-Stable tag: 1.1.1
+Stable tag: 1.1.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -202,6 +202,12 @@ Earlier versions of this plugin could handle alternative shortcodes, too: [audio
 
 == Changelog ==
 
+= 1.1.2 =
+* prevents activation conflicts with other instances of the plugin
+
+= 1.1.1 =
+* small bugfixes and improvements
+
 = 1.1 =
 * First proper release.
 * [audio] and [video] are deprecated: Use [podloveaudio] and [podlovevideo] instead!