Changeset 683444

Timestamp:

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

Author:

stephenh1988

Message:

Committing 1.8.2 - fixes bugs introduced in 1.8

Location:

event-organiser/trunk

Files:

• event-organiser.php (modified) (2 diffs)
• includes/event-organiser-archives.php (modified) (2 diffs)
• includes/event-organiser-event-functions.php (modified) (1 diff)
• languages/eventorganiser-fi.mo (added)
• languages/eventorganiser-fi.po (added)
• readme.txt (modified) (4 diffs)

event-organiser/trunk/event-organiser.php

@@ -3 +3 @@
 Plugin Name: Event Organiser
 Plugin URI: http://www.wp-event-organiser.com
-Version: 1.8.1
+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.1';
+$eventorganiser_db_version = '1.8.';
 
 

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

@@ -329 +329 @@
 
 function eventorganiser_is_event_query( $query, $exclusive = false ){
-    
+    
     $post_types = $query->get( 'post_type' );
     if( 'any' == $post_types )
         $post_types = get_post_types( array('exclude_from_search' => false) );
     
-    if( $post_types == 'event' ){
+    if( $post_types == 'event' ){
         $bool = true;
     }elseif( $exclusive ){
@@ -340 +340 @@
     }elseif( ( is_array( $post_types ) && in_array( 'event', $post_types ) ) ){
         $bool = true;
-    }elseif( $post_types == '' ){ 
-        $bool = eo_is_event_taxonomy();
     }else{
         $bool = false;
     }
 
-    return $bool;
+    return ;
 }
 

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

@@ -806 +806 @@
 
 /**
-* Checks if an event taxonomy archive page is being displayed. A simple wrapper for `is_tax()`.
+* Checks if the query is for an event taxonomy.
+*  
+* When no $query is passed, acts as a simple wrapper for `is_tax()`.
+* More generally acts as a wrapper for `$query->is_tax()`.
+* 
 * @since 1.6
 *
-* @return bool True if an event category, tag or venue archive page is being displayed. False otherwise.
- */
-function eo_is_event_taxonomy(){
+* @param $query - The query to check. If not passed, uses the global $wp_query;
+* @return bool True if query is for any event taxonomy (e.g. 'event-venue', 'event-category', 'event-tag').
+ */
+function eo_is_event_taxonomy( $query = false ){
     $event_tax = get_object_taxonomies( 'event' );
-    return ( is_tax( $event_tax ) );
+    if( !$query ){
+        return is_tax( $event_tax );
+    }else{
+        return $query->is_tax( $event_tax );
+    }
 }
 

event-organiser/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.3
 Tested up to: 3.5
-Stable tag: 1.8.1
+Stable tag: 1.8.
 License: GPLv3
 
@@ -66 +66 @@
 * Hungarian - Csaba Erdei 
 * Estonian - Kristjan Roosipuu
+
 
 == Installation ==
@@ -163 +164 @@
 
 == Changelog ==
+
+
+
+
+
+
+
 
 = 1.8 =
@@ -432 +440 @@
 
 == Upgrade Notice ==
+
+
+
+
 = 1.5 =
 1.5 is a big update, so please back-up before upgrading.