Changeset 1923030

Timestamp:

08/10/2018 04:11:44 PM (7 years ago)

Author:

smartcat

Message:

commit 442

Location:

our-team-enhanced/trunk

Files:

• assets/data (added)
• assets/data/demo.csv (added)
• constants.php (modified) (1 diff)
• includes/documentation.php (modified) (1 diff)
• includes/functions.php (modified) (1 diff)
• includes/libraries (added)
• includes/libraries/theme-showcase.php (added)
• includes/team_member-post-type.php (deleted)
• our-team-showcase.php (modified) (2 diffs)
• readme.txt (modified) (1 diff)

our-team-enhanced/trunk/constants.php

@@ -3 +3 @@
 namespace ots;
 
-const VERSION = '4.4.1';
+const VERSION = '4.4.2';
 
 

our-team-enhanced/trunk/includes/documentation.php

@@ -514 +514 @@
 
         <p>
-            <a href="//raw.githubusercontent.com/smartcatdev/docs/master/ots/demo-data.csv" class="button button-primary" download="team-export.csv"><?php _e( 'Download Sample CSV', 'ots' ); ?></a>
+            <a href="<?php echo asset('data/demo.csv' ) ?>" class="button button-primary" download="team-export.csv"><?php _e( 'Download Sample CSV', 'ots' ); ?></a>
         </p>
 

our-team-enhanced/trunk/includes/functions.php

@@ -26 +26 @@
 
     if( !empty( $group ) ) {
-
-        $args['tax_query'] = array(
-            'relation' => 'OR',
-            array(
-                'taxonomy'  => 'team_member_position',
-                'field'     => 'name',
-                'terms'     => $group
-            ),
-            array(
-                'taxonomy'  => 'team_member_position',
-                'field'     => 'slug',
-                'terms'     => $group
-            ),
-        array(
-            'taxonomy'  => 'team_member_position',
-            'field'     => 'term_id',
-            'terms'     => array_map(function ($g) { return absint($g); }, $group)
-                )
-        );
-
+        $group = (array) $group;
+
+        if ( is_int( $group[0] ) ) {
+            $args['tax_query'][] = array(
+                'taxonomy'  => 'team_member_position',
+                'field'     => 'term_id',
+                'terms'     => array_map(function ($g) { return absint($g); }, $group)
+            );
+
+        } else {
+            $args['tax_query'][] = array(
+                'taxonomy'  => 'team_member_position',
+                'field'     => 'slug',
+                'terms'     => $group
+            );
+        }
     }
 
     return new \WP_Query( $args );
-
 }
 

our-team-enhanced/trunk/our-team-showcase.php

@@ -4 +4 @@
  * Plugin URI: https://smartcatdesign.net/downloads/our-team-showcase/
  * Description: Display your team members in a very attractive way as a widget or page with a shortcode [our-team] or a widget
- * Version: 4.4.1
+ * Version: 4.4.2
  * Author: Smartcat
  * Author URI: https://smartcatdesign.net
@@ -16 +16 @@
  */
 include_once dirname( __FILE__ ) . '/constants.php';
+
+
+if ( !function_exists( 'scts_init' ) ) {
+    include_once dirname( __FILE__ ) . '/includes/libraries/theme-showcase.php';
+}
 
 

our-team-enhanced/trunk/readme.txt

@@ -100 +100 @@
 2. OR - Upload the unpacked folder folder via FTP into /wp-content/plugins
 
-== Changelog == 
+== Changelog ==
+
+= 4.4.2 =
+1. Improved query that pulls team members
 
 = 4.4.1 =