From 12932e0f55fc220893c5f865ce1018ce15bb2c87 Mon Sep 17 00:00:00 2001
From: Brian Miyaji <brian@themeboy.com>
Date: Tue, 29 Apr 2014 14:10:35 +1000
Subject: [PATCH] New event blocks shortcode

---
 includes/class-sp-shortcodes.php              | 14 ++++++++++-
 .../class-sp-shortcode-event-blocks.php       | 24 +++++++++++++++++++
 includes/sp-template-hooks.php                |  2 +-
 3 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 includes/shortcodes/class-sp-shortcode-event-blocks.php

diff --git a/includes/class-sp-shortcodes.php b/includes/class-sp-shortcodes.php
index eb5575fd..a746e87e 100644
--- a/includes/class-sp-shortcodes.php
+++ b/includes/class-sp-shortcodes.php
@@ -20,8 +20,9 @@ class SP_Shortcodes {
 			'event_details'			=> __CLASS__ . '::event_details',
 			'event_performance'		=> __CLASS__ . '::event_performance',
 			'countdown'      		=> __CLASS__ . '::countdown',
-			'event_list'     		=> __CLASS__ . '::event_list',
 			'event_calendar' 		=> __CLASS__ . '::event_calendar',
+			'event_list'     		=> __CLASS__ . '::event_list',
+			'event_blocks'     		=> __CLASS__ . '::event_blocks',
 			'league_table'   		=> __CLASS__ . '::league_table',
 			'player_list'    		=> __CLASS__ . '::player_list',
 			'player_gallery' 		=> __CLASS__ . '::player_gallery',
@@ -126,6 +127,17 @@ class SP_Shortcodes {
 		return self::shortcode_wrapper( array( 'SP_Shortcode_Event_List', 'output' ), $atts );
 	}
 
+	/**
+	 * Event blocks shortcode.
+	 *
+	 * @access public
+	 * @param mixed $atts
+	 * @return string
+	 */
+	public static function event_blocks( $atts ) {
+		return self::shortcode_wrapper( array( 'SP_Shortcode_Event_Blocks', 'output' ), $atts );
+	}
+
 	/**
 	 * Team columns shortcode.
 	 *
diff --git a/includes/shortcodes/class-sp-shortcode-event-blocks.php b/includes/shortcodes/class-sp-shortcode-event-blocks.php
new file mode 100644
index 00000000..7815273b
--- /dev/null
+++ b/includes/shortcodes/class-sp-shortcode-event-blocks.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Event Blocks Shortcode
+ *
+ * @author 		ThemeBoy
+ * @category 	Shortcodes
+ * @package 	SportsPress/Shortcodes/Event_Blocks
+ * @version     0.8
+ */
+class SP_Shortcode_Event_Blocks {
+
+	/**
+	 * Output the event blocks shortcode.
+	 *
+	 * @param array $atts
+	 */
+	public static function output( $atts ) {
+
+		if ( ! isset( $atts['id'] ) && isset( $atts[0] ) && is_numeric( $atts[0] ) )
+			$atts['id'] = $atts[0];
+
+		sp_get_template( 'event-blocks.php', $atts );
+	}
+}
diff --git a/includes/sp-template-hooks.php b/includes/sp-template-hooks.php
index 20069c19..c8b86587 100644
--- a/includes/sp-template-hooks.php
+++ b/includes/sp-template-hooks.php
@@ -217,7 +217,7 @@ add_filter( 'the_content', 'sportspress_content_post_views' );
 add_filter( 'get_the_content', 'sportspress_content_post_views' );
 
 function sportspress_widget_text( $content ) {
-	if ( ! preg_match( '/\[[\r\n\t ]*(countdown|events?(_|-)(results|details|performance|calendar|list)|team(_|-)columns|league(_|-)table|player(_|-)(metrics|performance|list|gallery))?[\r\n\t ].*?\]/', $content ) )
+	if ( ! preg_match( '/\[[\r\n\t ]*(countdown|events?(_|-)(results|details|performance|calendar|list|blocks)|team(_|-)columns|league(_|-)table|player(_|-)(metrics|performance|list|gallery))?[\r\n\t ].*?\]/', $content ) )
 		return $content;
 
 	$content = do_shortcode( $content );