WordPress.org

Plugin Directory

Changeset 599053


Ignore:
Timestamp:
09/14/12 18:27:43 (20 months ago)
Author:
joedolson
Message:

Commit 2.0.3

Location:
my-calendar/trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • my-calendar/trunk/my-calendar-core.php

    r598735 r599053  
    7070  $styles = mc_get_style_path( get_option( 'mc_css_file' ),'url' ); 
    7171    if ( get_option('mc_use_styles') != 'true' ) { 
    72      
    7372        $this_post = $wp_query->get_queried_object(); 
    7473        if (is_object($this_post)) { 
  • my-calendar/trunk/my-calendar-event-manager.php

    r598242 r599053  
    616616                    $offset = (60*60*get_option('gmt_offset')); 
    617617                    if ( !empty($data) ) { 
    618                         echo ($data->event_time == "00:00:00")?'':date("h:i a",strtotime($data->event_time)); 
     618                        echo ($data->event_time == "00:00:00" && $data->event_endtime == "00:00:00")?'':date("h:i a",strtotime($data->event_time)); 
    619619                    } else { 
    620620                        echo date_i18n("h:i a",time()+$offset); 
     
    624624            <label for="event_end" id="eelabel"><?php _e('End Date (YYYY-MM-DD)','my-calendar'); ?></label> <input type="text" name="event_end[]" id="event_end" class="event_end calendar_input" size="11" value="<?php echo $event_end; ?>" /> <label for="event_endtime"><?php _e('End Time (hh:mm am/pm)','my-calendar'); ?></label> <input type="text" id="event_endtime" name="event_endtime[]" class="input" size="10" value="<?php 
    625625                    if ( !empty($data) ) { 
    626                         echo ($data->event_endtime == "00:00:00")?'':date("h:i a",strtotime($data->event_endtime)); 
     626                        echo ($data->event_endtime == "00:00:00" && $data->event_time == "00:00:00")?'':date("h:i a",strtotime($data->event_endtime)); 
    627627                    } else { 
    628628                        echo date("h:i a",strtotime( "+1 hour" )+$offset ); 
  • my-calendar/trunk/my-calendar-output.php

    r598572 r599053  
    146146    $title_template = ($templates['title'] == '' )?'{title}':$templates['title']; 
    147147    $mytitle = jd_draw_template($data,$title_template); 
     148    if ( $mytitle == '' ) { $mytitle = jd_draw_template($data,'{title}'); } //prevent empty titles 
    148149    if ( strpos( $mytitle,'http' ) === false ) {  
    149150        if ( get_option('mc_open_uri') == 'true' ) { 
     
    185186                $body_details .= "\n    <span class='event-time dtstart' title='".$id_start.'T'.$event->event_time."'>$event_date".date_i18n(get_option('mc_time_format'), strtotime($event->event_time)); 
    186187                if ( $event->event_hide_end == 0 ) { 
    187                     if ($event->event_endtime != "00:00:00" && $event->event_endtime != '' && $event->event_endtime != $event->event_time ) { 
     188                    if ($event->event_endtime != '' && $event->event_endtime != $event->event_time ) { 
    188189                        $body_details .= "<span class='time-separator'> &ndash; </span><span class='end-time dtend' title='".$id_end.'T'.$event->event_endtime."'>".date_i18n(get_option('mc_time_format'), strtotime($event->event_endtime))."</span>"; 
    189190                    } 
  • my-calendar/trunk/my-calendar-shortcodes.php

    r598242 r599053  
    3737                'order' => 'asc', 
    3838                'skip' => '0', 
    39                 'author' => 'default'                
     39                'show_today' => 'yes', 
     40                'author' => 'default'            
    4041            ), $atts)); 
    41     return my_calendar_upcoming_events($before, $after, $type, $category, $template, $fallback, $order, $skip, $author ); 
     42    return my_calendar_upcoming_events($before, $after, $type, $category, $template, $fallback, $order, $skip, $show_today, $author ); 
    4243} 
    4344 
  • my-calendar/trunk/my-calendar.php

    r598735 r599053  
    66Author: Joseph C Dolson 
    77Author URI: http://www.joedolson.com 
    8 Version: 2.0.2 
     8Version: 2.0.3 
    99*/ 
    1010/*  Copyright 2009-2012  Joe Dolson (email : joe@joedolson.com) 
     
    2525*/ 
    2626global $mc_version, $wpdb; 
    27 $mc_version = '2.0.2'; 
     27$mc_version = '2.0.3'; 
    2828 
    2929// Define the tables used in My Calendar 
  • my-calendar/trunk/readme.txt

    r598735 r599053  
    22Contributors: joedolson 
    33Donate link: http://www.joedolson.com/donate.php 
    4 Tags: calendar, dates, times, events, scheduling, event manager 
     4Tags: calendar, dates, times, events, scheduling, event manager, event calendar 
    55Requires at least: 2.9.2 
    66Tested up to: 3.4.2 
     
    8989 
    9090== Changelog == 
     91 
     92= 2.0.3 = 
     93 
     94* Bug fix: Upcoming events widget did not support the "show_today's events" option correctly. 
     95* Bug fix: Was not possible to set 12:00 am as the end time for an event. 
     96* Bug fix: prevented blank title in main calendar due to faulty template. 
    9197 
    9298= 2.0.2 = 
Note: See TracChangeset for help on using the changeset viewer.