Fixed a couple of bugs

awesomemotive · Jul 11, 2013 · 4502312 · 4502312
1 parent 5e4b11b
commit 4502312
Show file tree

Hide file tree

Showing 7 changed files with 377 additions and 11 deletions.
diff --git a/assets/js/sc-ajax.js b/assets/js/sc-ajax.js
@@ -2,7 +2,11 @@ jQuery(document).ready(function($) {
 	$('body').on('submit', '.sc_events_form', function() {
 
 		document.body.style.cursor = 'wait';
-		var calendar = $(this).parent().parent().parent().parent().attr('id');
+		if( $(this).attr('id') == 'sc_event_select' ) {
+			var calendar = $(this).parent().parent().parent().attr('id');
+		} else {
+			var calendar = $(this).parent().parent().parent().parent().attr('id');
+		}
 		var data = $(this).serialize();
 	    $.post(sc_vars.ajaxurl, data, function (response) {
 	   		$('#' + calendar).html(response);

diff --git a/includes/calendar.php b/includes/calendar.php
@@ -20,10 +20,10 @@ function sc_get_events_calendar( $year_override = null ) {
 			$today_year = date('Y', $time);
 
 			// check for posted month/year
-			if( isset( $_POST['sc_nonce'] ) && wp_verify_nonce( $_POST['sc_nonce'], 'sc_calendar_nonce' ) ) {
-				$today_month 	= absint( $_POST['sc_month'] );
-				$today_year 	= absint( $_POST['sc_year'] );
-				$current_month 	= absint( $_POST['sc_current_month'] );
+			if(isset($_POST['sc_nonce']) && wp_verify_nonce($_POST['sc_nonce'], 'sc_calendar_nonce')) {
+				$today_month 	= isset( $_POST['sc_month'] )         ? absint( $_POST['sc_month'] )         : date( 'n' );
+				$today_year 	= isset( $_POST['sc_year'] )          ? absint( $_POST['sc_year'] )          : date( 'Y' );
+				$current_month 	= isset( $_POST['sc_current_month'] ) ? absint( $_POST['sc_current_month'] ) : date( 'n' );
 				if( isset( $_POST['sc_prev'] ) ) {
 					$today_year = $current_month == 1 ? $today_year - 1 : $today_year;
 				} elseif( isset( $_POST['sc_next'] ) ) {

diff --git a/includes/meta-boxes.php b/includes/meta-boxes.php
@@ -142,10 +142,10 @@ function sc_meta_box_save($post_id) {
 	$end_am_pm 		= sanitize_text_field( $_POST['sc_event_end_time_am_pm']);
 	$recurring		= isset($_POST['sc_event_recurring']) ? $_POST['sc_event_recurring'] : '';
 
-	if( $am_pm == 'pm' && $hours < 12 )
-		$hours += 12;
-	elseif( $am_pm == 'am' && $hours >= 12 )
-		$hours -= 12;
+	if( $am_pm == 'pm' && $hour < 12 )
+		$hour += 12;
+	elseif( $am_pm == 'am' && $hour >= 12 )
+		$hour -= 12;
 
 	$day 	= date( 'd', strtotime( $date ) );
 	$month 	= date( 'm', strtotime( $date ) );

diff --git a/languages/pippin_sc-pl_PL.mo b/languages/pippin_sc-pl_PL.mo