Merge branch 'develop'

Conflicts: README.md
gocodebox · Jun 5, 2015 · bc940c1 · bc940c1
2 parents 16ee9c0 + 445c015
commit bc940c1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -46,7 +46,6 @@ v1.2.7 - 2015-06-05
 + Woocommerce confict correction to archive templates
 + Style updates to allow themes better control on design
 
-
 v1.2.6 - 2015-04-28
 -------------------
 + Corrected issue with lesson re-order on save

diff --git a/includes/admin/class.llms.admin.analytics.php b/includes/admin/class.llms.admin.analytics.php
@@ -202,6 +202,7 @@ public static function save_search_fields( $analytics ) {
 	 			$search->date_range = $date_range;
 	 			$search->start_date = $date_range['start_date'];
 	 			$search->end_date = $date_range['end_date'];
+	 			$search->end_date_plus_one = LLMS_Date::db_date( $date_range['end_date'] . '+ 1 day');
 
 	 		} else {
 
@@ -418,4 +419,4 @@ public static function save_search_fields( $analytics ) {
 
 }
 
-endif;
+endif;
diff --git a/includes/class.llms.analytics.php b/includes/class.llms.analytics.php
@@ -340,7 +340,7 @@ public static function get_total_users_all_time( $post_id, $end_date ) {
 					MAX(IF(pa.meta_key = "_status", pa.meta_value, NULL)) AS status,
 					MAX(IF(pa.meta_key = "_is_complete", pa.updated_date, NULL)) AS completed_date
 					from '.$table_name.' p
-					left join wp_lifterlms_user_postmeta pa on p.user_id = pa.user_id and p.post_id = pa.post_id
+					left join '.$table_name.' pa on p.user_id = pa.user_id and p.post_id = pa.post_id
 					where p.post_id = %s 
 					and p.updated_date <= %s 
 					group by p.user_id', 

diff --git a/includes/llms.template.functions.php b/includes/llms.template.functions.php
@@ -602,16 +602,19 @@ function llms_setup_course_data( $post ) {
 		if ($post && $post->post_type == 'course') {
 			unset( $GLOBALS['course'] );
 
-			if ( is_int( $post ) )
+			if ( is_int( $post ) ) {
 				$post = get_post( $post );
-
-			if ( empty( $post->post_type ) )
+			}
+
+			if ( empty( $post->post_type ) ) {
 				return;
+			}
 
-				$GLOBALS['course'] = get_course( $post );
+			$GLOBALS['course'] = get_course( $post );
 
-				return $GLOBALS['course'];
+			return $GLOBALS['course'];
 		}
+
 	}
 
 }