Changeset 683387

Timestamp:

03/17/2013 08:40:15 PM (11 years ago)

Author:

stephenh1988

Message:

Fixing function duplication in 1.8

Location:

event-organiser/trunk

Files:

• event-organiser.php (modified) (2 diffs)
• includes/event-organiser-register.php (modified) (1 diff)
• readme.txt (modified) (1 diff)

event-organiser/trunk/event-organiser.php

@@ -3 +3 @@
 Plugin Name: Event Organiser
 Plugin URI: http://www.wp-event-organiser.com
-Version: 1.8
+Version: 1.8
 Description: Creates a custom post type 'events' with features such as reoccurring events, venues, Google Maps, calendar views and events and venue pages
 Author: Stephen Harris
@@ -42 +42 @@
  */ 
 global $eventorganiser_db_version;
-$eventorganiser_db_version = '1.8';
+$eventorganiser_db_version = '1.8';
 
 

event-organiser/trunk/includes/event-organiser-register.php

@@ -115 +115 @@
 add_action( 'admin_init', 'eventorganiser_register_scripts', 5 );
 
-
- /**
- * The "Comprehensive Google Map Plugin" plug-in deregisters all other Google scripts registered
- * by other plug-ins causing these plug-ins not to function. This plug-in removes that behaviour.
- *
- * Of course if two google scripts are loaded there may be problems, but this is better than always having
- * experiencing a 'bug'. At time writing the function responsible `cgmp_google_map_deregister_scripts()` 
- * can be found here {@see https://github.com/azagniotov/Comprehensive-Google-Map-Plugin/blob/master/functions.php#L520 }
- *
- * @see https://github.com/stephenharris/Event-Organiser/issues/49
- * @see http://wordpress.org/support/topic/googlemap-doesnt-shown-on-event-detail-page
- * @since 1.7.4
- * @ignore
- * @access private
- */
-function eventorganiser_cgmp_workaround(){
-    remove_action( 'wp_head', 'cgmp_google_map_deregister_scripts', 200 );
-}
-add_action( 'wp_head', 'eventorganiser_cgmp_workaround', 1 );
 
  /**

event-organiser/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.3
 Tested up to: 3.5
-Stable tag: 1.8
+Stable tag: 1.8
 License: GPLv3