merge with master

Author: hugosolar

plugins/cc-global-network/includes/gravityforms-interaction.php

@@ -2190,8 +2190,12 @@ function set_field_limits($field_limits)
         'max' => 3
     )
 ));
-
-
+new GFLimitCheckboxes(53, array(
+    1 => array(
+        'min' => 3,
+        'max' => 3
+    )
+));
 add_filter('gform_entries_field_value', 'ccgn_gf_display_name_instead_login', 10, 4);
 function ccgn_gf_display_name_instead_login($value, $form_id, $field_id, $entry)
 {
@@ -2200,5 +2204,15 @@ function ccgn_gf_display_name_instead_login($value, $form_id, $field_id, $entry)
         $user = get_user_by('email', $email);
         $value = $user->display_name;
     }
+    return $value;
+}
+add_filter( 'gform_export_field_value', 'export_user_display_name', 10, 4 );
+function export_user_display_name( $value, $form_id, $field_id, $entry ) {
+    if ( $field_id == 'created_by' ) {
+        $user  = get_user_by( 'id', $value );
+ 
+        return is_object( $user ) ? $user->display_name : $value;
+    }
+ 
     return $value;
 }

themes/cc-commoners/hub-page.php

@@ -5,21 +5,22 @@
 get_header(); ?>
 
 
-	<?php
-	//while ( have_posts() ) : the_post();
+<?php
+    //while ( have_posts() ) : the_post();
 
-		//get_template_part( 'template-parts/loop/frontpage-loop' );
+//get_template_part( 'template-parts/loop/frontpage-loop' );
 
-		/*
+/*
 		if ( comments_open() || get_comments_number() ) :
 			//comments_template();
 		endif;
 		*/
 
-	//endwhile; // End of the loop.
-	?>
+//endwhile; // End of the loop.
+?>
 
 
+<<<<<<< HEAD
 <div class="grid-container space-top">
 	<div class="grid-x">
 		<div class="cell large-12">
@@ -97,4 +98,5 @@
 		</div>	
 	</div>
 </div>
+
 <?php get_footer();