Inspection of "Daily Inspection: re-add code removed during merge..." - eventespresso/event-espresso-core - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Branch — FET-8385-datetime-ticket-selec... (04c1c3)

unknown

created 2016-12-21 21:51 UTC

Status

Braces +5 added lines, -3 removed lines patch added patch discarded remove patch

@@ -1,7 +1,8 @@  discard block
 block discarded – undo
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -49,8 +50,9 @@  discard block
 block discarded – undo
 			);
 		$this->_MSGR->set_validator_config( $new_config );
 
-		if ( $this->_context != 'admin' )
-			$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		if ( $this->_context != 'admin' ) {
+					$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		}
 
 		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
 	}

Please login to merge, or discard this patch.

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -1,6 +1,6 @@  discard block
 block discarded – undo
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -30,11 +30,11 @@  discard block
 block discarded – undo
 class EE_Messages_Email_Payment_Reminder_Validator extends EE_Messages_Validator {
 
 
-	public function __construct( $fields, $context ) {
+	public function __construct($fields, $context) {
 		$this->_m_name = 'email';
 		$this->_mt_name = 'payment_reminder';
 
-		parent::__construct( $fields, $context );
+		parent::__construct($fields, $context);
 	}
 
 	/**
@@ -45,17 +45,17 @@  discard block
 block discarded – undo
 
 		//modify just event_list
 		$new_config['event_list'] = array(
-			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization','recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
+			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
 			);
 		$new_config['ticket_list'] = array(
 			'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'recipient_details', 'transaction')
 			);
 		$new_config['content'] = array(
-			'shortcodes' => array('event_list','attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
+			'shortcodes' => array('event_list', 'attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
 			);
-		$this->_messenger->set_validator_config( $new_config );
+		$this->_messenger->set_validator_config($new_config);
 
-		if ( $this->_context != 'admin' )
+		if ($this->_context != 'admin')
 			$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
 
 		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');

Please login to merge, or discard this patch.

message_type/payment_cancelled/EE_Payment_Cancelled_message_type.class.php 2 patches

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -1,6 +1,6 @@
 block discarded – undo
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**

Please login to merge, or discard this patch.

Braces +2 added lines, -1 removed lines patch added patch discarded remove patch

@@ -6,8 +6,9 @@
 block discarded – undo
  * @package Event Espresso
  * @subpackage messages
  */
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  *

Please login to merge, or discard this patch.

payment_declined/EE_Messages_Email_Payment_Declined_Validator.class.php 2 patches

Braces +5 added lines, -3 removed lines patch added patch discarded remove patch

@@ -1,7 +1,8 @@  discard block
 block discarded – undo
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -49,8 +50,9 @@  discard block
 block discarded – undo
 			);
 		$this->_MSGR->set_validator_config( $new_config );
 
-		if ( $this->_context != 'admin' )
-			$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		if ( $this->_context != 'admin' ) {
+					$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		}
 
 		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
 	}

Please login to merge, or discard this patch.

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -1,6 +1,6 @@  discard block
 block discarded – undo
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -30,11 +30,11 @@  discard block
 block discarded – undo
 class EE_Messages_Email_Payment_Reminder_Validator extends EE_Messages_Validator {
 
 
-	public function __construct( $fields, $context ) {
+	public function __construct($fields, $context) {
 		$this->_m_name = 'email';
 		$this->_mt_name = 'payment_reminder';
 
-		parent::__construct( $fields, $context );
+		parent::__construct($fields, $context);
 	}
 
 	/**
@@ -45,17 +45,17 @@  discard block
 block discarded – undo
 
 		//modify just event_list
 		$new_config['event_list'] = array(
-			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization','recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
+			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
 			);
 		$new_config['ticket_list'] = array(
 			'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'recipient_details', 'transaction')
 			);
 		$new_config['content'] = array(
-			'shortcodes' => array('event_list','attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
+			'shortcodes' => array('event_list', 'attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
 			);
-		$this->_messenger->set_validator_config( $new_config );
+		$this->_messenger->set_validator_config($new_config);
 
-		if ( $this->_context != 'admin' )
+		if ($this->_context != 'admin')
 			$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
 
 		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');

Please login to merge, or discard this patch.

message_type/payment_declined/EE_Payment_Declined_message_type.class.php 2 patches

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -1,6 +1,6 @@
 block discarded – undo
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**

Please login to merge, or discard this patch.

Braces +2 added lines, -1 removed lines patch added patch discarded remove patch

@@ -6,8 +6,9 @@
 block discarded – undo
  * @package Event Espresso
  * @subpackage messages
  */
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  *

Please login to merge, or discard this patch.

payment_failed/EE_Messages_Email_Payment_Failed_Validator.class.php 2 patches

Braces +5 added lines, -3 removed lines patch added patch discarded remove patch

@@ -1,7 +1,8 @@  discard block
 block discarded – undo
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -49,8 +50,9 @@  discard block
 block discarded – undo
 			);
 		$this->_MSGR->set_validator_config( $new_config );
 
-		if ( $this->_context != 'admin' )
-			$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		if ( $this->_context != 'admin' ) {
+					$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		}
 
 		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
 	}

Please login to merge, or discard this patch.

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -1,6 +1,6 @@  discard block
 block discarded – undo
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -30,11 +30,11 @@  discard block
 block discarded – undo
 class EE_Messages_Email_Payment_Reminder_Validator extends EE_Messages_Validator {
 
 
-	public function __construct( $fields, $context ) {
+	public function __construct($fields, $context) {
 		$this->_m_name = 'email';
 		$this->_mt_name = 'payment_reminder';
 
-		parent::__construct( $fields, $context );
+		parent::__construct($fields, $context);
 	}
 
 	/**
@@ -45,17 +45,17 @@  discard block
 block discarded – undo
 
 		//modify just event_list
 		$new_config['event_list'] = array(
-			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization','recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
+			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
 			);
 		$new_config['ticket_list'] = array(
 			'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'recipient_details', 'transaction')
 			);
 		$new_config['content'] = array(
-			'shortcodes' => array('event_list','attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
+			'shortcodes' => array('event_list', 'attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
 			);
-		$this->_messenger->set_validator_config( $new_config );
+		$this->_messenger->set_validator_config($new_config);
 
-		if ( $this->_context != 'admin' )
+		if ($this->_context != 'admin')
 			$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
 
 		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');

Please login to merge, or discard this patch.

message_type/payment_failed/EE_Payment_Failed_message_type.class.php 2 patches

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -1,6 +1,6 @@
 block discarded – undo
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**

Please login to merge, or discard this patch.

Braces +2 added lines, -1 removed lines patch added patch discarded remove patch

@@ -6,8 +6,9 @@
 block discarded – undo
  * @package Event Espresso
  * @subpackage messages
  */
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  *

Please login to merge, or discard this patch.

payment_reminder/EE_Messages_Email_Payment_Reminder_Validator.class.php 2 patches

Braces +5 added lines, -3 removed lines patch added patch discarded remove patch

@@ -1,7 +1,8 @@  discard block
 block discarded – undo
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -49,8 +50,9 @@  discard block
 block discarded – undo
 			);
 		$this->_MSGR->set_validator_config( $new_config );
 
-		if ( $this->_context != 'admin' )
-			$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		if ( $this->_context != 'admin' ) {
+					$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
+		}
 
 		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
 	}

Please login to merge, or discard this patch.

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -1,6 +1,6 @@  discard block
 block discarded – undo
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -30,11 +30,11 @@  discard block
 block discarded – undo
 class EE_Messages_Email_Payment_Reminder_Validator extends EE_Messages_Validator {
 
 
-	public function __construct( $fields, $context ) {
+	public function __construct($fields, $context) {
 		$this->_m_name = 'email';
 		$this->_mt_name = 'payment_reminder';
 
-		parent::__construct( $fields, $context );
+		parent::__construct($fields, $context);
 	}
 
 	/**
@@ -45,17 +45,17 @@  discard block
 block discarded – undo
 
 		//modify just event_list
 		$new_config['event_list'] = array(
-			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization','recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
+			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
 			);
 		$new_config['ticket_list'] = array(
 			'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'recipient_details', 'transaction')
 			);
 		$new_config['content'] = array(
-			'shortcodes' => array('event_list','attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
+			'shortcodes' => array('event_list', 'attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
 			);
-		$this->_messenger->set_validator_config( $new_config );
+		$this->_messenger->set_validator_config($new_config);
 
-		if ( $this->_context != 'admin' )
+		if ($this->_context != 'admin')
 			$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
 
 		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');

Please login to merge, or discard this patch.

message_type/payment_reminder/EE_Payment_Reminder_message_type.class.php 2 patches

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -1,6 +1,6 @@
 block discarded – undo
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**

Please login to merge, or discard this patch.

Braces +2 added lines, -1 removed lines patch added patch discarded remove patch

@@ -6,8 +6,9 @@
 block discarded – undo
  * @package Event Espresso
  * @subpackage messages
  */
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  *

Please login to merge, or discard this patch.

caffeinated/modules/event_single_caff/EED_Event_Single_Caff.module.php 3 patches

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

		@@ -1,4 +1,6 @@
		block discarded – undo
1		-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
	1	+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
	2	+ exit('No direct script access allowed');
	3	+}
2	4	/**
3	5	* Event Espresso
4	6	*

Please login to merge, or discard this patch.

Doc Comments +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -116,7 +116,7 @@
 block discarded – undo
 	 * @access    	public
 	 * @param 		EE_Template_Config $CFG
 	 * @param 		array $REQ
-	 * @return    	EE_Event_Single_Config
+	 * @return    	EE_Template_Config
 	 */
 	public static function update_template_settings( $CFG, $REQ ) {
 		$display_order_tickets = isset( $CFG->EED_Event_Single->display_order_tickets ) ? $CFG->EED_Event_Single->display_order_tickets : 100;

Please login to merge, or discard this patch.

Spacing +45 added lines, -45 removed lines patch added patch discarded remove patch

@@ -29,7 +29,7 @@  discard block
 block discarded – undo
 	 * @return EED_Event_Single_Caff
 	 */
 	public static function instance() {
-		return parent::get_instance( __CLASS__ );
+		return parent::get_instance(__CLASS__);
 	}
 
 
@@ -50,34 +50,34 @@  discard block
 block discarded – undo
 	 *  @return 	void
 	 */
 	public static function set_hooks_admin() {
-		define( 'EVENT_SINGLE_CAFF_TEMPLATES_PATH', plugin_dir_path( __FILE__ ) . 'templates' . DS );
-		define( 'EVENT_SINGLE_CAFF_ASSETS_URL', plugin_dir_url( __FILE__ ) . 'assets' . DS );
+		define('EVENT_SINGLE_CAFF_TEMPLATES_PATH', plugin_dir_path(__FILE__).'templates'.DS);
+		define('EVENT_SINGLE_CAFF_ASSETS_URL', plugin_dir_url(__FILE__).'assets'.DS);
 		add_action(
 			'FHEE__EE_Admin_Page___load_page_dependencies__after_load__espresso_events__template_settings',
-			array( 'EED_Event_Single_Caff', 'load_scripts_styles' ),
+			array('EED_Event_Single_Caff', 'load_scripts_styles'),
 			10
 		);
-		add_action( 'AHEE__template_settings__template__before_settings_form', array( 'EED_Event_Single_Caff', 'template_settings_form' ), 10 );
-		add_filter( 'FHEE__General_Settings_Admin_Page__update_template_settings__data', array( 'EED_Event_Single_Caff', 'update_template_settings' ), 10, 2 );
+		add_action('AHEE__template_settings__template__before_settings_form', array('EED_Event_Single_Caff', 'template_settings_form'), 10);
+		add_filter('FHEE__General_Settings_Admin_Page__update_template_settings__data', array('EED_Event_Single_Caff', 'update_template_settings'), 10, 2);
 		// AJAX
-		add_action( 'wp_ajax_espresso_update_event_single_order', array( 'EED_Event_Single_Caff', 'update_event_single_order' ) );
-		add_action( 'wp_ajax_nopriv_espresso_update_event_single_order', array( 'EED_Event_Single_Caff', 'update_event_single_order' ) );
+		add_action('wp_ajax_espresso_update_event_single_order', array('EED_Event_Single_Caff', 'update_event_single_order'));
+		add_action('wp_ajax_nopriv_espresso_update_event_single_order', array('EED_Event_Single_Caff', 'update_event_single_order'));
 
 	}
 
 
 
 	public static function load_scripts_styles() {
-		add_action( 'admin_enqueue_scripts', array( 'EED_Event_Single_Caff', 'enqueue_scripts_styles' ), 10 );
+		add_action('admin_enqueue_scripts', array('EED_Event_Single_Caff', 'enqueue_scripts_styles'), 10);
 	}
 
 
 
 	public static function enqueue_scripts_styles() {
-		wp_register_style( 'eed-event-single-sortable', EVENT_SINGLE_CAFF_ASSETS_URL . 'eed_event_single_sortable.css', array(), EVENT_ESPRESSO_VERSION );
-		wp_enqueue_style( 'eed-event-single-sortable' );
-		wp_register_script( 'eed-event-single-sortable', EVENT_SINGLE_CAFF_ASSETS_URL . 'eed_event_single_sortable.js', array( 'jquery-ui-sortable' ), EVENT_ESPRESSO_VERSION, true );
-		wp_enqueue_script( 'eed-event-single-sortable' );
+		wp_register_style('eed-event-single-sortable', EVENT_SINGLE_CAFF_ASSETS_URL.'eed_event_single_sortable.css', array(), EVENT_ESPRESSO_VERSION);
+		wp_enqueue_style('eed-event-single-sortable');
+		wp_register_script('eed-event-single-sortable', EVENT_SINGLE_CAFF_ASSETS_URL.'eed_event_single_sortable.js', array('jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, true);
+		wp_enqueue_script('eed-event-single-sortable');
 	}
 
 
@@ -91,21 +91,21 @@  discard block
 block discarded – undo
 	 */
 	public static function template_settings_form() {
 		$config = EE_Registry::instance()->CFG->template_settings;
-		$config = isset( $config->EED_Event_Single ) && $config->EED_Event_Single instanceof EE_Event_Single_Config ? $config->EED_Event_Single : new EE_Event_Single_Config();
-		$config->use_sortable_display_order = isset( $config->use_sortable_display_order ) ? $config->use_sortable_display_order : false;
-		$config = apply_filters( 'FHEE__EED_Event_Single__template_settings_form__event_list_config', $config );
+		$config = isset($config->EED_Event_Single) && $config->EED_Event_Single instanceof EE_Event_Single_Config ? $config->EED_Event_Single : new EE_Event_Single_Config();
+		$config->use_sortable_display_order = isset($config->use_sortable_display_order) ? $config->use_sortable_display_order : false;
+		$config = apply_filters('FHEE__EED_Event_Single__template_settings_form__event_list_config', $config);
 
 		$event_single_order_array = array();
-		$event_single_order_array[ $config->display_order_tickets ] = 'tickets';
-		$event_single_order_array[ $config->display_order_datetimes ] = 'datetimes';
-		$event_single_order_array[ $config->display_order_event ] = 'event';
-		$event_single_order_array[ $config->display_order_venue ] = 'venue';
+		$event_single_order_array[$config->display_order_tickets] = 'tickets';
+		$event_single_order_array[$config->display_order_datetimes] = 'datetimes';
+		$event_single_order_array[$config->display_order_event] = 'event';
+		$event_single_order_array[$config->display_order_venue] = 'venue';
 		// get template parts
-		$template_parts = EED_Event_Single::instance()->initialize_template_parts( $config );
+		$template_parts = EED_Event_Single::instance()->initialize_template_parts($config);
 		// convert to array so that we can add more properties
-		$config = get_object_vars( $config );
-		$config[ 'event_single_display_order' ] = $template_parts->generate_sortable_list_of_template_parts( 'event-single-sortable-js', '', 'single-sortable-li single-sortable-js' );
-		EEH_Template::display_template( EVENT_SINGLE_CAFF_TEMPLATES_PATH . 'admin-event-single-settings.template.php', $config );
+		$config = get_object_vars($config);
+		$config['event_single_display_order'] = $template_parts->generate_sortable_list_of_template_parts('event-single-sortable-js', '', 'single-sortable-li single-sortable-js');
+		EEH_Template::display_template(EVENT_SINGLE_CAFF_TEMPLATES_PATH.'admin-event-single-settings.template.php', $config);
 	}
 
 
@@ -118,20 +118,20 @@  discard block
 block discarded – undo
 	 * @param 		array $REQ
 	 * @return    	EE_Event_Single_Config
 	 */
-	public static function update_template_settings( $CFG, $REQ ) {
-		$display_order_tickets = isset( $CFG->EED_Event_Single->display_order_tickets ) ? $CFG->EED_Event_Single->display_order_tickets : 100;
-		$display_order_datetimes = isset( $CFG->EED_Event_Single->display_order_datetimes ) ? $CFG->EED_Event_Single->display_order_datetimes : 110;
-		$display_order_event = isset( $CFG->EED_Event_Single->display_order_event ) ? $CFG->EED_Event_Single->display_order_event : 120;
-		$display_order_venue = isset( $CFG->EED_Event_Single->display_order_venue ) ? $CFG->EED_Event_Single->display_order_venue : 130;
+	public static function update_template_settings($CFG, $REQ) {
+		$display_order_tickets = isset($CFG->EED_Event_Single->display_order_tickets) ? $CFG->EED_Event_Single->display_order_tickets : 100;
+		$display_order_datetimes = isset($CFG->EED_Event_Single->display_order_datetimes) ? $CFG->EED_Event_Single->display_order_datetimes : 110;
+		$display_order_event = isset($CFG->EED_Event_Single->display_order_event) ? $CFG->EED_Event_Single->display_order_event : 120;
+		$display_order_venue = isset($CFG->EED_Event_Single->display_order_venue) ? $CFG->EED_Event_Single->display_order_venue : 130;
 		$CFG->EED_Event_Single = new EE_Event_Single_Config();
-		$CFG->EED_Event_Single->display_status_banner_single = !empty( $REQ['display_status_banner_single'] ) && $REQ['display_status_banner_single'] ? TRUE : FALSE;
-		$CFG->EED_Event_Single->display_venue = ! empty( $REQ['display_venue'] ) && $REQ['display_venue'] ? TRUE : FALSE;
-		$CFG->EED_Event_Single->use_sortable_display_order = ! empty( $REQ[ 'EED_Events_Single_use_sortable_display_order' ] ) ? absint( $REQ[ 'EED_Events_Single_use_sortable_display_order' ] ) : 0;
+		$CFG->EED_Event_Single->display_status_banner_single = ! empty($REQ['display_status_banner_single']) && $REQ['display_status_banner_single'] ? TRUE : FALSE;
+		$CFG->EED_Event_Single->display_venue = ! empty($REQ['display_venue']) && $REQ['display_venue'] ? TRUE : FALSE;
+		$CFG->EED_Event_Single->use_sortable_display_order = ! empty($REQ['EED_Events_Single_use_sortable_display_order']) ? absint($REQ['EED_Events_Single_use_sortable_display_order']) : 0;
 		$CFG->EED_Event_Single->display_order_tickets = $CFG->EED_Event_Single->use_sortable_display_order ? $display_order_tickets : 100;
 		$CFG->EED_Event_Single->display_order_datetimes = $CFG->EED_Event_Single->use_sortable_display_order ? $display_order_datetimes : 110;
 		$CFG->EED_Event_Single->display_order_event = $CFG->EED_Event_Single->use_sortable_display_order ? $display_order_event : 120;
 		$CFG->EED_Event_Single->display_order_venue = $CFG->EED_Event_Single->use_sortable_display_order ? $display_order_venue : 130;
-		do_action( 'AHEE__EED_Event_Single__update_template_settings__after_update', $CFG, $REQ );
+		do_action('AHEE__EED_Event_Single__update_template_settings__after_update', $CFG, $REQ);
 		return $CFG;
 	}
 
@@ -145,23 +145,23 @@  discard block
 block discarded – undo
 	 */
 	public static function update_event_single_order() {
 		$config_saved = false;
-		$template_parts = sanitize_text_field( $_POST[ 'elements' ] );
-		if ( ! empty( $template_parts ) ) {
-			$template_parts = explode( ',', trim( $template_parts, ',' ) );
-			foreach ( $template_parts as $key => $template_part ) {
+		$template_parts = sanitize_text_field($_POST['elements']);
+		if ( ! empty($template_parts)) {
+			$template_parts = explode(',', trim($template_parts, ','));
+			foreach ($template_parts as $key => $template_part) {
 				$template_part = "display_order_$template_part";
-				$priority = ( $key * 10 ) + 100;
+				$priority = ($key * 10) + 100;
 				EE_Registry::instance()->CFG->template_settings->EED_Event_Single->$template_part = $priority;
-				do_action( "AHEE__EED_Event_Single__update_event_single_order__$template_part", $priority );
+				do_action("AHEE__EED_Event_Single__update_event_single_order__$template_part", $priority);
 			}
-			$config_saved = EE_Registry::instance()->CFG->update_espresso_config( false, false );
+			$config_saved = EE_Registry::instance()->CFG->update_espresso_config(false, false);
 		}
-		if ( $config_saved ) {
-			EE_Error::add_success( __( 'Display Order has been successfully updated.', 'event_espresso' ) );
+		if ($config_saved) {
+			EE_Error::add_success(__('Display Order has been successfully updated.', 'event_espresso'));
 		} else {
-			EE_Error::add_error( __( 'Display Order was not updated.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
+			EE_Error::add_error(__('Display Order was not updated.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
 		}
-		echo wp_json_encode( EE_Error::get_notices( false ));
+		echo wp_json_encode(EE_Error::get_notices(false));
 		exit();
 	}
 
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
 	 * @param WP $WP
 	 * @return    void
 	 */
-	public function run( $WP ) {
+	public function run($WP) {
 	}
 
 

Please login to merge, or discard this patch.

		@@ -29,7 +29,7 @@ discard block
		block discarded – undo
29	29	* @return EED_Event_Single_Caff
30	30	*/
31	31	public static function instance() {
32		- return parent::get_instance( __CLASS__ );
	32	+ return parent::get_instance(__CLASS__);
33	33	}
34	34
35	35
		@@ -50,34 +50,34 @@ discard block
		block discarded – undo
50	50	* @return void
51	51	*/
52	52	public static function set_hooks_admin() {
53		- define( 'EVENT_SINGLE_CAFF_TEMPLATES_PATH', plugin_dir_path( __FILE__ ) . 'templates' . DS );
54		- define( 'EVENT_SINGLE_CAFF_ASSETS_URL', plugin_dir_url( __FILE__ ) . 'assets' . DS );
	53	+ define('EVENT_SINGLE_CAFF_TEMPLATES_PATH', plugin_dir_path(__FILE__).'templates'.DS);
	54	+ define('EVENT_SINGLE_CAFF_ASSETS_URL', plugin_dir_url(__FILE__).'assets'.DS);
55	55	add_action(
56	56	'FHEE__EE_Admin_Page___load_page_dependencies__after_load__espresso_events__template_settings',
57		- array( 'EED_Event_Single_Caff', 'load_scripts_styles' ),
	57	+ array('EED_Event_Single_Caff', 'load_scripts_styles'),
58	58	10
59	59	);
60		- add_action( 'AHEE__template_settings__template__before_settings_form', array( 'EED_Event_Single_Caff', 'template_settings_form' ), 10 );
61		- add_filter( 'FHEE__General_Settings_Admin_Page__update_template_settings__data', array( 'EED_Event_Single_Caff', 'update_template_settings' ), 10, 2 );
	60	+ add_action('AHEE__template_settings__template__before_settings_form', array('EED_Event_Single_Caff', 'template_settings_form'), 10);
	61	+ add_filter('FHEE__General_Settings_Admin_Page__update_template_settings__data', array('EED_Event_Single_Caff', 'update_template_settings'), 10, 2);
62	62	// AJAX
63		- add_action( 'wp_ajax_espresso_update_event_single_order', array( 'EED_Event_Single_Caff', 'update_event_single_order' ) );
64		- add_action( 'wp_ajax_nopriv_espresso_update_event_single_order', array( 'EED_Event_Single_Caff', 'update_event_single_order' ) );
	63	+ add_action('wp_ajax_espresso_update_event_single_order', array('EED_Event_Single_Caff', 'update_event_single_order'));
	64	+ add_action('wp_ajax_nopriv_espresso_update_event_single_order', array('EED_Event_Single_Caff', 'update_event_single_order'));
65	65
66	66	}
67	67
68	68
69	69
70	70	public static function load_scripts_styles() {
71		- add_action( 'admin_enqueue_scripts', array( 'EED_Event_Single_Caff', 'enqueue_scripts_styles' ), 10 );
	71	+ add_action('admin_enqueue_scripts', array('EED_Event_Single_Caff', 'enqueue_scripts_styles'), 10);
72	72	}
73	73
74	74
75	75
76	76	public static function enqueue_scripts_styles() {
77		- wp_register_style( 'eed-event-single-sortable', EVENT_SINGLE_CAFF_ASSETS_URL . 'eed_event_single_sortable.css', array(), EVENT_ESPRESSO_VERSION );
78		- wp_enqueue_style( 'eed-event-single-sortable' );
79		- wp_register_script( 'eed-event-single-sortable', EVENT_SINGLE_CAFF_ASSETS_URL . 'eed_event_single_sortable.js', array( 'jquery-ui-sortable' ), EVENT_ESPRESSO_VERSION, true );
80		- wp_enqueue_script( 'eed-event-single-sortable' );
	77	+ wp_register_style('eed-event-single-sortable', EVENT_SINGLE_CAFF_ASSETS_URL.'eed_event_single_sortable.css', array(), EVENT_ESPRESSO_VERSION);
	78	+ wp_enqueue_style('eed-event-single-sortable');
	79	+ wp_register_script('eed-event-single-sortable', EVENT_SINGLE_CAFF_ASSETS_URL.'eed_event_single_sortable.js', array('jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, true);
	80	+ wp_enqueue_script('eed-event-single-sortable');
81	81	}
82	82
83	83
		@@ -91,21 +91,21 @@ discard block
		block discarded – undo
91	91	*/
92	92	public static function template_settings_form() {
93	93	$config = EE_Registry::instance()->CFG->template_settings;
94		- $config = isset( $config->EED_Event_Single ) && $config->EED_Event_Single instanceof EE_Event_Single_Config ? $config->EED_Event_Single : new EE_Event_Single_Config();
95		- $config->use_sortable_display_order = isset( $config->use_sortable_display_order ) ? $config->use_sortable_display_order : false;
96		- $config = apply_filters( 'FHEE__EED_Event_Single__template_settings_form__event_list_config', $config );
	94	+ $config = isset($config->EED_Event_Single) && $config->EED_Event_Single instanceof EE_Event_Single_Config ? $config->EED_Event_Single : new EE_Event_Single_Config();
	95	+ $config->use_sortable_display_order = isset($config->use_sortable_display_order) ? $config->use_sortable_display_order : false;
	96	+ $config = apply_filters('FHEE__EED_Event_Single__template_settings_form__event_list_config', $config);
97	97
98	98	$event_single_order_array = array();
99		- $event_single_order_array[ $config->display_order_tickets ] = 'tickets';
100		- $event_single_order_array[ $config->display_order_datetimes ] = 'datetimes';
101		- $event_single_order_array[ $config->display_order_event ] = 'event';
102		- $event_single_order_array[ $config->display_order_venue ] = 'venue';
	99	+ $event_single_order_array[$config->display_order_tickets] = 'tickets';
	100	+ $event_single_order_array[$config->display_order_datetimes] = 'datetimes';
	101	+ $event_single_order_array[$config->display_order_event] = 'event';
	102	+ $event_single_order_array[$config->display_order_venue] = 'venue';
103	103	// get template parts
104		- $template_parts = EED_Event_Single::instance()->initialize_template_parts( $config );
	104	+ $template_parts = EED_Event_Single::instance()->initialize_template_parts($config);
105	105	// convert to array so that we can add more properties
106		- $config = get_object_vars( $config );
107		- $config[ 'event_single_display_order' ] = $template_parts->generate_sortable_list_of_template_parts( 'event-single-sortable-js', '', 'single-sortable-li single-sortable-js' );
108		- EEH_Template::display_template( EVENT_SINGLE_CAFF_TEMPLATES_PATH . 'admin-event-single-settings.template.php', $config );
	106	+ $config = get_object_vars($config);
	107	+ $config['event_single_display_order'] = $template_parts->generate_sortable_list_of_template_parts('event-single-sortable-js', '', 'single-sortable-li single-sortable-js');
	108	+ EEH_Template::display_template(EVENT_SINGLE_CAFF_TEMPLATES_PATH.'admin-event-single-settings.template.php', $config);
109	109	}
110	110
111	111
		@@ -118,20 +118,20 @@ discard block
		block discarded – undo
118	118	* @param array $REQ
119	119	* @return EE_Event_Single_Config
120	120	*/
121		- public static function update_template_settings( $CFG, $REQ ) {
122		- $display_order_tickets = isset( $CFG->EED_Event_Single->display_order_tickets ) ? $CFG->EED_Event_Single->display_order_tickets : 100;
123		- $display_order_datetimes = isset( $CFG->EED_Event_Single->display_order_datetimes ) ? $CFG->EED_Event_Single->display_order_datetimes : 110;
124		- $display_order_event = isset( $CFG->EED_Event_Single->display_order_event ) ? $CFG->EED_Event_Single->display_order_event : 120;
125		- $display_order_venue = isset( $CFG->EED_Event_Single->display_order_venue ) ? $CFG->EED_Event_Single->display_order_venue : 130;
	121	+ public static function update_template_settings($CFG, $REQ) {
	122	+ $display_order_tickets = isset($CFG->EED_Event_Single->display_order_tickets) ? $CFG->EED_Event_Single->display_order_tickets : 100;
	123	+ $display_order_datetimes = isset($CFG->EED_Event_Single->display_order_datetimes) ? $CFG->EED_Event_Single->display_order_datetimes : 110;
	124	+ $display_order_event = isset($CFG->EED_Event_Single->display_order_event) ? $CFG->EED_Event_Single->display_order_event : 120;
	125	+ $display_order_venue = isset($CFG->EED_Event_Single->display_order_venue) ? $CFG->EED_Event_Single->display_order_venue : 130;
126	126	$CFG->EED_Event_Single = new EE_Event_Single_Config();
127		- $CFG->EED_Event_Single->display_status_banner_single = !empty( $REQ['display_status_banner_single'] ) && $REQ['display_status_banner_single'] ? TRUE : FALSE;
128		- $CFG->EED_Event_Single->display_venue = ! empty( $REQ['display_venue'] ) && $REQ['display_venue'] ? TRUE : FALSE;
129		- $CFG->EED_Event_Single->use_sortable_display_order = ! empty( $REQ[ 'EED_Events_Single_use_sortable_display_order' ] ) ? absint( $REQ[ 'EED_Events_Single_use_sortable_display_order' ] ) : 0;
	127	+ $CFG->EED_Event_Single->display_status_banner_single = ! empty($REQ['display_status_banner_single']) && $REQ['display_status_banner_single'] ? TRUE : FALSE;
	128	+ $CFG->EED_Event_Single->display_venue = ! empty($REQ['display_venue']) && $REQ['display_venue'] ? TRUE : FALSE;
	129	+ $CFG->EED_Event_Single->use_sortable_display_order = ! empty($REQ['EED_Events_Single_use_sortable_display_order']) ? absint($REQ['EED_Events_Single_use_sortable_display_order']) : 0;
130	130	$CFG->EED_Event_Single->display_order_tickets = $CFG->EED_Event_Single->use_sortable_display_order ? $display_order_tickets : 100;
131	131	$CFG->EED_Event_Single->display_order_datetimes = $CFG->EED_Event_Single->use_sortable_display_order ? $display_order_datetimes : 110;
132	132	$CFG->EED_Event_Single->display_order_event = $CFG->EED_Event_Single->use_sortable_display_order ? $display_order_event : 120;
133	133	$CFG->EED_Event_Single->display_order_venue = $CFG->EED_Event_Single->use_sortable_display_order ? $display_order_venue : 130;
134		- do_action( 'AHEE__EED_Event_Single__update_template_settings__after_update', $CFG, $REQ );
	134	+ do_action('AHEE__EED_Event_Single__update_template_settings__after_update', $CFG, $REQ);
135	135	return $CFG;
136	136	}
137	137
		@@ -145,23 +145,23 @@ discard block
		block discarded – undo
145	145	*/
146	146	public static function update_event_single_order() {
147	147	$config_saved = false;
148		- $template_parts = sanitize_text_field( $_POST[ 'elements' ] );
149		- if ( ! empty( $template_parts ) ) {
150		- $template_parts = explode( ',', trim( $template_parts, ',' ) );
151		- foreach ( $template_parts as $key => $template_part ) {
	148	+ $template_parts = sanitize_text_field($_POST['elements']);
	149	+ if ( ! empty($template_parts)) {
	150	+ $template_parts = explode(',', trim($template_parts, ','));
	151	+ foreach ($template_parts as $key => $template_part) {
152	152	$template_part = "display_order_$template_part";
153		- $priority = ( $key * 10 ) + 100;
	153	+ $priority = ($key * 10) + 100;
154	154	EE_Registry::instance()->CFG->template_settings->EED_Event_Single->$template_part = $priority;
155		- do_action( "AHEE__EED_Event_Single__update_event_single_order__$template_part", $priority );
	155	+ do_action("AHEE__EED_Event_Single__update_event_single_order__$template_part", $priority);
156	156	}
157		- $config_saved = EE_Registry::instance()->CFG->update_espresso_config( false, false );
	157	+ $config_saved = EE_Registry::instance()->CFG->update_espresso_config(false, false);
158	158	}
159		- if ( $config_saved ) {
160		- EE_Error::add_success( __( 'Display Order has been successfully updated.', 'event_espresso' ) );
	159	+ if ($config_saved) {
	160	+ EE_Error::add_success(__('Display Order has been successfully updated.', 'event_espresso'));
161	161	} else {
162		- EE_Error::add_error( __( 'Display Order was not updated.', 'event_espresso' ), __FILE__, __FUNCTION__, __LINE__ );
	162	+ EE_Error::add_error(__('Display Order was not updated.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
163	163	}
164		- echo wp_json_encode( EE_Error::get_notices( false ));
	164	+ echo wp_json_encode(EE_Error::get_notices(false));
165	165	exit();
166	166	}
167	167
		@@ -174,7 +174,7 @@ discard block
		block discarded – undo
174	174	* @param WP $WP
175	175	* @return void
176	176	*/
177		- public function run( $WP ) {
	177	+ public function run($WP) {
178	178	}
179	179
180	180

		@@ -1,7 +1,8 @@ discard block
		block discarded – undo
1	1	<?php
2	2
3		-if (!defined('EVENT_ESPRESSO_VERSION') )
	3	+if (!defined('EVENT_ESPRESSO_VERSION') ) {
4	4	exit('NO direct script access allowed');
	5	+}
5	6
6	7	/**
7	8	* Event Espresso
		@@ -49,8 +50,9 @@ discard block
		block discarded – undo
49	50	);
50	51	$this->_MSGR->set_validator_config( $new_config );
51	52
52		- if ( $this->_context != 'admin' )
53		- $this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
	53	+ if ( $this->_context != 'admin' ) {
	54	+ $this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
	55	+ }
54	56
55	57	$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
56	58	}

		@@ -1,6 +1,6 @@ discard block
		block discarded – undo
1	1	<?php
2	2
3		-if (!defined('EVENT_ESPRESSO_VERSION') )
	3	+if ( ! defined('EVENT_ESPRESSO_VERSION'))
4	4	exit('NO direct script access allowed');
5	5
6	6	/**
		@@ -30,11 +30,11 @@ discard block
		block discarded – undo
30	30	class EE_Messages_Email_Payment_Reminder_Validator extends EE_Messages_Validator {
31	31
32	32
33		- public function __construct( $fields, $context ) {
	33	+ public function __construct($fields, $context) {
34	34	$this->_m_name = 'email';
35	35	$this->_mt_name = 'payment_reminder';
36	36
37		- parent::__construct( $fields, $context );
	37	+ parent::__construct($fields, $context);
38	38	}
39	39
40	40	/**
		@@ -45,17 +45,17 @@ discard block
		block discarded – undo
45	45
46	46	//modify just event_list
47	47	$new_config['event_list'] = array(
48		- 'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization','recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
	48	+ 'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
49	49	);
50	50	$new_config['ticket_list'] = array(
51	51	'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'recipient_details', 'transaction')
52	52	);
53	53	$new_config['content'] = array(
54		- 'shortcodes' => array('event_list','attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
	54	+ 'shortcodes' => array('event_list', 'attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
55	55	);
56		- $this->_messenger->set_validator_config( $new_config );
	56	+ $this->_messenger->set_validator_config($new_config);
57	57
58		- if ( $this->_context != 'admin' )
	58	+ if ($this->_context != 'admin')
59	59	$this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
60	60
61	61	$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');

		@@ -1,6 +1,6 @@
		block discarded – undo
1	1	<?php
2	2
3		-if (!defined('EVENT_ESPRESSO_VERSION') )
	3	+if ( ! defined('EVENT_ESPRESSO_VERSION'))
4	4	exit('NO direct script access allowed');
5	5
6	6	/**

		@@ -6,8 +6,9 @@
		block discarded – undo
6	6	* @package Event Espresso
7	7	* @subpackage messages
8	8	*/
9		-if (!defined('EVENT_ESPRESSO_VERSION') )
	9	+if (!defined('EVENT_ESPRESSO_VERSION') ) {
10	10	exit('NO direct script access allowed');
	11	+}
11	12
12	13	/**
13	14	*

		@@ -116,7 +116,7 @@
		block discarded – undo
116	116	* @access public
117	117	* @param EE_Template_Config $CFG
118	118	* @param array $REQ
119		- * @return EE_Event_Single_Config
	119	+ * @return EE_Template_Config
120	120	*/
121	121	public static function update_template_settings( $CFG, $REQ ) {
122	122	$display_order_tickets = isset( $CFG->EED_Event_Single->display_order_tickets ) ? $CFG->EED_Event_Single->display_order_tickets : 100;

eventespresso / event-espresso-core

Branch — FET-8385-datetime-ticket-selec... (04c1c3)

Status

Category

Braces +5 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Braces +2 added lines, -1 removed lines patch added patch discarded remove patch

Braces +5 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Braces +2 added lines, -1 removed lines patch added patch discarded remove patch

Braces +5 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Braces +2 added lines, -1 removed lines patch added patch discarded remove patch

Braces +5 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Braces +2 added lines, -1 removed lines patch added patch discarded remove patch

Braces +3 added lines, -1 removed lines patch added patch discarded remove patch

Doc Comments +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +45 added lines, -45 removed lines patch added patch discarded remove patch