WordPress.org

Plugin Directory

Changeset 700872


Ignore:
Timestamp:
04/20/13 22:36:01 (12 months ago)
Author:
joedolson
Message:

Bug fixes.

Location:
my-calendar/trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • my-calendar/trunk/my-calendar-event-manager.php

    r699369 r700872  
    832832                <option value="none"> -- </option> 
    833833                <?php foreach ( $locations as $location ) { 
    834                     if ( !empty($data) && $data->event_label == $location->location_label ) { $checked = ' selected="selected"'; } else { $checked = ''; } 
    835                     echo "<option value=\"".$location->location_id."\"$checked>".stripslashes($location->location_label)."</option>"; 
     834                    //if ( !empty($data) && $data->event_label == $location->location_label ) { $checked = ' selected="selected"'; } else { $checked = ''; } 
     835                    echo "<option value=\"".$location->location_id."\">".stripslashes($location->location_label)."</option>"; 
    836836                } ?> 
    837837            </select> 
     
    12981298        $event_hide_end = ( $time == '' || $time == '00:00:00' )?1:$event_hide_end; // hide end time automatically on all day events 
    12991299        // set location 
    1300             if ($location_preset != 'none') { 
     1300            if ( $location_preset != 'none' ) { 
    13011301                $sql = "SELECT * FROM " . my_calendar_locations_table() . " WHERE location_id = $location_preset"; 
    13021302                $location = $mcdb->get_row($sql); 
  • my-calendar/trunk/my-calendar-output.php

    r699369 r700872  
    14231423                $url = mc_maplink( $value, 'url', $source='location' ); 
    14241424                if ( $url ) { 
    1425                     $output .= "<li><a href='$url'>$label</a></li>"; 
     1425                    $output .= "<li>$url</li>"; 
    14261426                } else { 
    14271427                    $output .= "<li>$label</li>"; 
  • my-calendar/trunk/my-calendar-settings.php

    r699369 r700872  
    3030            $format = array( '%s','%s','%s','%s','%s','%s','%s','%d','%d','%d','%d','%s' ); 
    3131            $update = $mcdb->insert( my_calendar_table(), $data, $format ); 
     32            $events_results = ( $update ) ? true : false;  
    3233            $event_ids[] = $mcdb->insert_id; 
    3334        } 
    3435 
    3536        foreach ( $event_ids as $value ) { // propagate event instances. 
    36                 $sql = "SELECT event_begin, event_time, event_end, event_endtime FROM ".my_calendar_table()." WHERE event_id = $value"; 
     37                $sql = "SELECT event_begin, event_time, event_end, event_endtime FROM ".my_calendar_table()." WHERE event_id = $value";              
    3738                $event = $wpdb->get_results($sql); 
     39                $event = $event[0]; 
    3840                $dates = array( 'event_begin'=>$event->event_begin,'event_end'=>$event->event_end,'event_time'=>$event->event_time,'event_endtime'=>$event->event_endtime ); 
    3941                $event = mc_increment_event( $value, $dates );               
     
    320322<div class="metabox-holder"> 
    321323  <?php 
    322 update_option( 'ko_calendar_imported','false' ); 
     324//update_option( 'ko_calendar_imported','false' ); // for testing importing. 
    323325if (isset($_POST['import']) && $_POST['import'] == 'true') { 
    324326    $nonce=$_REQUEST['_wpnonce']; 
  • my-calendar/trunk/my-calendar-templates.php

    r700425 r700872  
    9292 
    9393function mc_hcard( $event, $address='true', $map='true', $source='event' ) { 
    94     $the_map = mc_maplink( $event, 'map', $source ); 
     94    $the_map = mc_maplink( $event, 'url', $source ); 
    9595    $event_url = ($source=='event')?$event->event_url:$event->location_url; 
    9696    $event_label = stripslashes( ($source=='event')?$event->event_label:$event->location_label ); 
  • my-calendar/trunk/my-calendar.php

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

    r700425 r700872  
    8585 
    8686== Changelog == 
     87 
     88= 2.2.2 = 
     89 
     90* Bug fix to importer from Calendar 
     91* Another fix to link_map (this time, in the standard calendar view.) 
     92* Bug fix: location preset being assigned didn't allow changes to location details when editing events. 
    8793 
    8894= 2.2.1 = 
Note: See TracChangeset for help on using the changeset viewer.