Changeset 688029

Timestamp:

03/27/2013 04:45:11 PM (11 years ago)

Author:

stephenh1988

Message:

Committing 1.8.3

Location:

event-organiser/trunk

Files:

• classes/class-eo-calendar-widget.php (modified) (1 diff)
• classes/class-eo-event-list-widget.php (modified) (1 diff)
• event-organiser.php (modified) (5 diffs)
• includes/event-organiser-archives.php (modified) (7 diffs)
• includes/event-organiser-event-functions.php (modified) (6 diffs)
• includes/event-organiser-register.php (modified) (2 diffs)
• includes/event-organiser-utility-functions.php (modified) (4 diffs)
• includes/event.php (modified) (7 diffs)
• js/frontend.js (modified) (1 diff)
• js/frontend.min.js (modified) (1 diff)
• readme.md (modified) (4 diffs)
• readme.txt (modified) (3 diffs)

event-organiser/trunk/classes/class-eo-calendar-widget.php

@@ -131 +131 @@
 * param $month - DateTime object for first day of the month (in blog timezone)
 */
-function generate_output($month,$args=array()){
-
-    $key= $month->format('YM').serialize($args).get_locale();
+function generate_output( $month, $args=array() ){
+
+    //Translations
+    global $wp_locale;
+    
+    $today = new DateTime('now',eo_get_blog_timezone());
+
+    $key= $month->format('YM').serialize($args).get_locale().$today->format('Y-m-d');
     $calendar = get_transient('eo_widget_calendar');
     if( $calendar && is_array($calendar) && isset($calendar[$key]) ){
         return $calendar[$key];
     }
-    
-    //Translations
-    global $wp_locale;
-
-    //Month should be a DateTime object of the first day in that month      
-    $today = new DateTime('now',eo_get_blog_timezone());
     
     //Month details

event-organiser/trunk/classes/class-eo-event-list-widget.php

@@ -208 +208 @@
     }
 
-    wp_reset_query();
+    wp_reset_();
 
     if( $echo )

event-organiser/trunk/event-organiser.php

@@ -3 +3 @@
 Plugin Name: Event Organiser
 Plugin URI: http://www.wp-event-organiser.com
-Version: 1.8.2
+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.2';
+$eventorganiser_db_version = '1.8.';
 
 
@@ -187 +187 @@
     require_once(EVENT_ORGANISER_DIR.'event-organiser-venues.php');
     require_once(EVENT_ORGANISER_DIR.'event-organiser-calendar.php');
-    
-else:
-    /****** Templates ******/
-    require_once('includes/event-organiser-templates.php');    
+           
 endif;
 
@@ -204 +201 @@
 require_once(EVENT_ORGANISER_DIR.'includes/deprecated.php');
 require_once(EVENT_ORGANISER_DIR.'includes/event.php');
+
+
+
 
 /****** Widgets and Shortcodes ******/
@@ -222 +222 @@
     register_widget( 'EO_Widget_Venues' );
 }
-?>

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

@@ -50 +50 @@
         $query->set('event-venue',$venue);
         $query->set( 'post_type', 'event' );
-       }
-
+    }
+
+    //If the query is for eo-events feed, set post type
+    if( $query->is_feed( 'eo-events' ) ){
+        $query->set( 'post_type', 'event' );
+    }   
+    
     //If querying for all events starting on given date, set the date parameters
     if( !empty($query->query_vars['ondate']) ) {
@@ -81 +86 @@
 
     //If not on event, stop here.
-    if( ! eventorganiser_is_event_query( $query ) )
+    if( ! eventorganiser_is_event_query( $query ) )
         return $query;
 
@@ -260 +265 @@
 function eventorganiser_event_fields( $select, $query ){
     global $wpdb;
-
-    if( eventorganiser_is_event_query( $query ) ){
+    
+    if( eventorganiser_is_event_query( $query ) ){
         $et =$wpdb->eo_events;
         /* Include 'event_occurrence' for backwards compatibility. Will eventually be removed. */
@@ -295 +300 @@
     }
 
-    if( eventorganiser_is_event_query( $query ) ):
+    if( eventorganiser_is_event_query( $query ) ):
         if(empty($groupby))
             return $groupby;
@@ -321 +326 @@
     global $wpdb;
 
-    if( eventorganiser_is_event_query( $query ) ){
+    if( eventorganiser_is_event_query( $query ) ){
         $join .=" LEFT JOIN $wpdb->eo_events ON $wpdb->posts.id = {$wpdb->eo_events}.post_id ";
     }
@@ -334 +339 @@
         $post_types = get_post_types( array('exclude_from_search' => false) );
     
-    if( $post_types == 'event' || eo_is_event_taxonomy( $query ) ){
+    
+    if( $post_types == 'event' ){
         $bool = true;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     }elseif( $exclusive ){
         $bool = false;
+
     }elseif( ( is_array( $post_types ) && in_array( 'event', $post_types ) ) ){
         $bool = true;
+
     }else{
         $bool = false;
+
     }
 
@@ -362 +398 @@
 
     //Only alter event queries
-    if( eventorganiser_is_event_query( $query ) ):
+    if( eventorganiser_is_event_query( $query ) ):
 
         //If we only want events (or occurrences of events) that belong to a particular 'event'

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

@@ -182 +182 @@
     $start = $occurrences[$occurrence_id]['start'];
 
-    return eo_format_datetime($start,$format);
+    return );
 }
 
@@ -274 +274 @@
     $end = $occurrences[$occurrence_id]['end'];
 
-    return eo_format_datetime($end,$format);
+    return );
 }
 
@@ -308 +308 @@
         return false;
 
-    return eo_format_datetime($next_occurrence['start'],$format);
+    $next = $next_occurrence['start'];
+    return apply_filters('eventorganiser_get_next_occurrence', eo_format_datetime( $next, $format ), $next, $format, $post_id );
 }
 
@@ -442 +443 @@
     $post_id = (int) ( empty($post_id) ? get_the_ID() : $post_id);
     $schedule = eo_get_event_schedule($post_id);
-    return eo_format_datetime($schedule['schedule_start'],$format);
+    $schedule_start = $schedule['schedule_start'];
+    return apply_filters('eventorganiser_get_schedule_start', eo_format_datetime( $schedule_start, $format ), $schedule_start, $format, $post_id );
 }
 
@@ -471 +473 @@
     $post_id = (int) ( empty($post_id) ? get_the_ID() : $post_id);
     $schedule = eo_get_event_schedule($post_id);
-    return eo_format_datetime($schedule['schedule_last'],$format);
+    $schedule_last = $schedule['schedule_last'];
+    return apply_filters('eventorganiser_get_schedule_last', eo_format_datetime( $schedule_last, $format ), $schedule_last, $format, $post_id );
 }
 
@@ -818 +821 @@
 function eo_is_event_taxonomy( $query = false ){
     $event_tax = get_object_taxonomies( 'event' );
+
+
+
+
+
+
+
+
+
+
+
+
+
     if( !$query ){
         return is_tax( $event_tax );

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

@@ -10 +10 @@
 function eventorganiser_register_script() {
     global $wp_locale;
-    $version = '1.8';
+    $version = '1.8';
 
     $ext = (defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG) ? '' : '.min';
@@ -77 +77 @@
  */
 function eventorganiser_register_scripts(){
-    $version = '1.8';
+    $version = '1.8';
     $ext = (defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG) ? '' : '.min';
 

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

@@ -787 +787 @@
     $args = wp_parse_args($args,array(
         'type' => 'text', 'value'=>'', 'tinymce' => '', 'help' => '',
-        'class'=>'large-text', 'echo'=>true,'rows'=>5, 'cols'=>50
+        'class'=>'large-text', 'echo'=>true,'rows'=>5, 'cols'=>50,
+        'readonly'=> false,
     ));
 
@@ -794 +795 @@
     $value = $args['value'];
     $class = $args['class'];
+
     $html ='';
 
@@ -802 +804 @@
             ));
     }else{
-        $html .= sprintf('<textarea cols="%s" rows="%d" name="%s" class="%s large-text" id="%s">%s</textarea>',
+        $html .= sprintf('<textarea cols="%s" rows="%d" name="%s" class="%s large-text" id="%s">%s</textarea>',
                 intval($args['cols']),
                 intval($args['rows']),
@@ -808 +810 @@
                 sanitize_html_class($class),
                 esc_attr($id),
+
                 esc_textarea($value)
         );

event-organiser/trunk/includes/event.php

@@ -48 +48 @@
             unset($event_data['category']);
         }
+
+
+
 
         if( !empty($post_data) ){
@@ -62 +65 @@
             $event_data['schedule'] = 'custom';
         }
-
+        
         //Do we need to delete existing dates from db?
         $delete_existing = false;
@@ -99 +102 @@
         }
 
-        do_action('eventorganiser_save_event', $post_id);
+        do_action();
         return $post_id;
     }
@@ -147 +150 @@
             unset($event_data['category']);
         }
+
+
+
 
         //If schedule is 'once' and dates are included - set to 'custom':
@@ -169 +175 @@
             
         //Action used to break cache & trigger Pro actions (& by other plug-ins?)
-        do_action('eventorganiser_save_event',$post_id);
+        do_action();
         return $post_id;
     }
@@ -183 +189 @@
     global $wpdb;
     
-    do_action('eventorganiser_delete_event', $post_id);
+    do_action( 'eventorganiser_delete_event', $post_id ); //Deprecated - do not use!
+    do_action( 'eventorganiser_delete_event_occurrences', $post_id );
     $del = $wpdb->get_results($wpdb->prepare("DELETE FROM $wpdb->eo_events WHERE post_id=%d",$post_id));
 }
@@ -207 +214 @@
 
             /* Storing a DateInterval object can cause errors. Serialize it.
-            http://www.harriswebsolutions.co.uk/event-organiser/forums/topic/error-when-saving-events/
              Thanks to Mathieu Parisot, Mathias & Dave Page */
-            $event_data['duration'] = maybe_serialize($duration);
+            $event_data['duration'] = maybe_serialize();
         }
 

event-organiser/trunk/js/frontend.js

@@ -237 +237 @@
 
         $(".eo_widget_calendar tfoot").unbind("click");
-        $(".eo_widget_calendar tfoot a").die("click").live("click", function (a) {
+        $(".eo_widget_calendar tfoot a").("click", function (a) {
                     a.preventDefault();
                     var b = $(this).closest(".eo_widget_calendar").attr("id");

event-organiser/trunk/js/frontend.min.js

@@ -9 +9 @@
 if(typeof h.category!=="undefined"&&h.category!="")b.category=h.category;if(typeof h.venue!=="undefined"&&h.venue!="")b.venue=h.venue;jQuery.ajax({url:EOAjax.ajaxurl+"?action=eventorganiser-fullcal",dataType:"JSON",data:b,success:g})},selectable:false,weekMode:"variable",aspectRatio:1.5,loading:function(b){var d=a("#"+a(this).attr("id")+"_loading");if(b){window.clearTimeout(l);l=window.setTimeout(function(){d.show()},1E3)}else{window.clearTimeout(l);d.hide()}}})}a(".eo-cal-filter").change(function(){a(".eo-fullcalendar").fullCalendar("rerenderEvents")});
 a(".eo-mini-calendar").datepicker({dateFormat:"DD, d MM, yy",changeMonth:true,changeYear:true,dateFormat:"DD, d MM, yy",firstDay:parseInt(EOAjax.fullcal.firstDay),buttonText:EOAjaxFront.locale.gotodate,monthNamesShort:EOAjaxFront.locale.monthAbbrev,dayNamesMin:EOAjaxFront.locale.dayAbbrev,showOn:"button",onSelect:function(b){var d=a(this).parents("div.eo-fullcalendar").attr("id");a("#"+d).fullCalendar("gotoDate",new Date(Date.parse(b)))}})}if(a(".eo_widget_calendar").length>0){a(".eo_widget_calendar tfoot").unbind("click");
-a(".eo_widget_calendar tfoot a").die("click").live("click",function(b){b.preventDefault();var d=a(this).closest(".eo_widget_calendar").attr("id");b={showpastevents:1};if(typeof EOAjax!=="undefined"&&typeof EOAjax.widget_calendars!=="undefined")b=EOAjax.widget_calendars[d];if(typeof eo_widget_cal!=="undefined")b=eo_widget_cal[d];b.eo_month=eveorg_getParameterByName("eo_month",a(this).attr("href"));a.getJSON(EOAjaxFront.adminajax+"?action=eo_widget_cal",b,function(g){a("#"+d+"_content").html(g)})})}if(a(".eo-agenda-widget").length>
+a(".eo_widget_calendar tfoot a").("click",function(b){b.preventDefault();var d=a(this).closest(".eo_widget_calendar").attr("id");b={showpastevents:1};if(typeof EOAjax!=="undefined"&&typeof EOAjax.widget_calendars!=="undefined")b=EOAjax.widget_calendars[d];if(typeof eo_widget_cal!=="undefined")b=eo_widget_cal[d];b.eo_month=eveorg_getParameterByName("eo_month",a(this).attr("href"));a.getJSON(EOAjaxFront.adminajax+"?action=eo_widget_cal",b,function(g){a("#"+d+"_content").html(g)})})}if(a(".eo-agenda-widget").length>
 0){function o(b,d){a.ajax({url:EOAjaxFront.adminajax,dataType:"JSON",data:{action:"eo_widget_agenda",instance_number:d.number,direction:b,start:d.StartDate,end:d.EndDate},success:function(g){if(!jQuery.isArray(g)||!g[0])return false;else{d.StartDate=g[0].StartDate;d.EndDate=g[g.length-1].StartDate;r(g,d)}}})}function r(b,d){var g=a("#"+d.id+"_container"),h=g.find("ul.dates"),i=h.find("li");a(i).remove();i="";for(c=0;c<b.length;c++){if(i==""||i!=b[c].StartDate&&d.mode=="day"){i=b[c].StartDate;var p=
 a('<li class="date" >'+b[c].display+'<ul class="a-date"></ul></li>');h.append(p)}var q=d.add_to_google?a('<li class="event"></li>').append('<span class="cat"></span><span><strong>'+b[c].time+": </strong></span>"+b[c].post_title).append('<div class="meta" style="display:none;"><span>'+b[c].link+"</span><span> \u00a0 </span><span>"+b[c].Glink+"</span></div>"):a('<li class="event"></li>').append("<a class='eo-agenda-event-permalink' href='"+b[c].event_url+"'><span class='cat'></span><span><strong>"+

event-organiser/trunk/readme.md

@@ -5 +5 @@
 **Requires at least:** 3.3  
 **Tested up to:** 3.5  
-**Stable tag:** 1.8  
+**Stable tag:** 1.8
 **License:** GPLv3  
 
@@ -66 +66 @@
 * Hungarian - Csaba Erdei 
 * Estonian - Kristjan Roosipuu
+
 
 ## Installation ##
@@ -175 +176 @@
 
 ## Changelog ##
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 ### 1.8 ###
@@ -444 +459 @@
 
 ## Upgrade Notice ##
+
+
+
+
 ### 1.5 ###
 1.5 is a big update, so please back-up before upgrading.

event-organiser/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.3
 Tested up to: 3.5
-Stable tag: 1.8.2
+Stable tag: 1.8.
 License: GPLv3
 
@@ -165 +165 @@
 == Changelog ==
 
+
+
+
+
+
+
+
 = 1.8.2 =
 * Fixes event taxonomy sorting bug introduced in 1.8
@@ -441 +448 @@
 == Upgrade Notice ==
 
+
+
+
 = 1.8.2 =
 If you have upgrade to 1.8 or 1.8.1 please upgrade to 1.8.2. This update includes fixes to bugs introduced in 1.8.