From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 14 Oct 2016 19:15:53 +0000 (-0400)
Subject: Merge branch 'develop' into feature/dashboard
X-Git-Tag: v1.5.0^2~1^2~1
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=447f039cfa9dc8a86fd6951a5efc89c7ef412617;p=WP-Plugins%2Fglm-member-db-events.git

Merge branch 'develop' into feature/dashboard
---

447f039cfa9dc8a86fd6951a5efc89c7ef412617
diff --cc setup/adminHooks.php
index 1992dd8,8fc019c..b952399
--- a/setup/adminHooks.php
+++ b/setup/adminHooks.php
@@@ -25,21 -25,17 +25,35 @@@
   *
   *  Also note that parameters will be in the context of the main admin controller constructor.
   */
+ add_filter( 'glm-member-db-events-get-events', function( $output ){
+     $events = $this->wpdb->get_results(
+         "SELECT E.id,E.name,T1.start_time as start
+            FROM " . GLM_MEMBERS_EVENTS_PLUGIN_DB_PREFIX . "events E,
+                 " . GLM_MEMBERS_EVENTS_PLUGIN_DB_PREFIX . "times T1
+           WHERE E.status = 10
+             AND T1.event = E.id AND T1.start_time IN (SELECT MIN(start_time)
+                                                         FROM " . GLM_MEMBERS_EVENTS_PLUGIN_DB_PREFIX . "times
+                                                        WHERE event = E.id)
+          ORDER BY start DESC",
+         ARRAY_A
+     );
+     return $events;
+ } );
 +add_filter(
 +    'glm-member-db-dashboard-member-widgets',
 +    function ( $member = null ) {
 +        $content = $this->controller( 'dashboard', 'events', $member );
 +        return $content;
 +    },
 +    12,
 +    1
 +);
 +add_filter(
 +    'glm-member-db-dashboard-member-admin-widgets',
 +    function ( $member = null ) {
 +        $content = $this->controller( 'dashboard', 'events', $member );
 +        return $content;
 +    },
 +    12,
 +    1
 +);