eventespresso / event-espresso-core

core/db_classes/EE_Taxes.class.php

Braces +3 added lines, -2 removed lines

@@ -36,8 +36,9 @@
 		$tax = 0;
 		$total_tax = 0;
 		//This first checks to see if the given ticket is taxable.
-		if ( ! $ticket->get( 'TKT_taxable' ) )
-			return $tax;
+		if ( ! $ticket->get( 'TKT_taxable' ) ) {
+					return $tax;
+		}
 		//get subtotal (notice we're only retrieving a subtotal if there isn't one given)
 		$subtotal = self::get_subtotal_for_admin( $ticket );
 		//get taxes

Spacing +18 added lines, -18 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Taxes class
@@ -32,20 +32,20 @@ 
 	 * @param  EE_Ticket $ticket incoming EE_Ticket
 	 * @return float             total taxes to apply to ticket.
 	 */
-	public static function get_total_taxes_for_admin( EE_Ticket $ticket ) {
+	public static function get_total_taxes_for_admin(EE_Ticket $ticket) {
 		$tax = 0;
 		$total_tax = 0;
 		//This first checks to see if the given ticket is taxable.
-		if ( ! $ticket->get( 'TKT_taxable' ) )
+		if ( ! $ticket->get('TKT_taxable'))
 			return $tax;
 		//get subtotal (notice we're only retrieving a subtotal if there isn't one given)
-		$subtotal = self::get_subtotal_for_admin( $ticket );
+		$subtotal = self::get_subtotal_for_admin($ticket);
 		//get taxes
 		$taxes = self::get_taxes_for_admin();
 		//apply taxes to subtotal
-		foreach ( $taxes as $tax ) {
+		foreach ($taxes as $tax) {
 			//assuming taxes are not cumulative
-			$total_tax += $subtotal * $tax->get( 'PRC_amount' ) / 100;
+			$total_tax += $subtotal * $tax->get('PRC_amount') / 100;
 		}
 		return $total_tax;
 	}
@@ -56,9 +56,9 @@ 
 	 * @param EE_Ticket $ticket
 	 * @return float
 	 */
-	public static function get_subtotal_for_admin( EE_Ticket $ticket ) {
+	public static function get_subtotal_for_admin(EE_Ticket $ticket) {
 		$TKT_ID = $ticket->ID();
-		return isset( self::$_subtotal[ $TKT_ID ] ) ? self::$_subtotal[ $TKT_ID ] : self::_get_subtotal_for_admin( $ticket );
+		return isset(self::$_subtotal[$TKT_ID]) ? self::$_subtotal[$TKT_ID] : self::_get_subtotal_for_admin($ticket);
 	}
 
 
@@ -68,26 +68,26 @@ 
 	 * @param  EE_Ticket $ticket
 	 * @return float     subtotal calculated from all EE_Price[] on Ticket.
 	 */
-	private static function _get_subtotal_for_admin( EE_Ticket $ticket ) {
+	private static function _get_subtotal_for_admin(EE_Ticket $ticket) {
 		$subtotal = 0;
 		//get all prices
-		$prices = $ticket->get_many_related( 'Price', array( 'default_where_conditions' => 'none', 'order_by' => array( 'PRC_order' => 'ASC' ) ) );
+		$prices = $ticket->get_many_related('Price', array('default_where_conditions' => 'none', 'order_by' => array('PRC_order' => 'ASC')));
 		//let's loop through them (base price is always the first item)
-		foreach ( $prices as $price ) {
-			if ( $price instanceof EE_Price ) {
-				switch ( $price->type_obj()->base_type() ) {
+		foreach ($prices as $price) {
+			if ($price instanceof EE_Price) {
+				switch ($price->type_obj()->base_type()) {
 					case 1: // base price
 					case 3: // surcharges
-						$subtotal += $price->is_percent() ? $subtotal * $price->get( 'PRC_amount' ) / 100 : $price->get( 'PRC_amount' );
+						$subtotal += $price->is_percent() ? $subtotal * $price->get('PRC_amount') / 100 : $price->get('PRC_amount');
 						break;
 					case 2: // discounts
-						$subtotal -= $price->is_percent() ? $subtotal * $price->get( 'PRC_amount' ) / 100 : $price->get( 'PRC_amount' );
+						$subtotal -= $price->is_percent() ? $subtotal * $price->get('PRC_amount') / 100 : $price->get('PRC_amount');
 						break;
 				}
 			}
 		}
 		$TKT_ID = $ticket->ID();
-		self::$_subtotal = array( $TKT_ID => $subtotal );
+		self::$_subtotal = array($TKT_ID => $subtotal);
 		return $subtotal;
 	}
 
@@ -98,7 +98,7 @@ 
 	 * @return EE_Price[] EE_Price objects that have PRT_ID == 4
 	 */
 	public static function get_taxes_for_admin() {
-		self::$_default_taxes = ! empty( self::$_default_taxes ) ? self::$_default_taxes : EE_Registry::instance()->load_model( 'Price' )->get_all( array( array( 'Price_Type.PBT_ID' => 4 ) ) );
+		self::$_default_taxes = ! empty(self::$_default_taxes) ? self::$_default_taxes : EE_Registry::instance()->load_model('Price')->get_all(array(array('Price_Type.PBT_ID' => 4)));
 		return self::$_default_taxes;
 	}
 

core/db_classes/EE_Term_Relationship.class.php

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -30,9 +30,9 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Term_Relationship
 	 */
-	public static function new_instance( $props_n_values = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values );
+	public static function new_instance($props_n_values = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values);
 	}
 
 
@@ -41,8 +41,8 @@ 
 	 * @param array $props_n_values
 	 * @return EE_Term_Relationship
 	 */
-	public static function new_instance_from_db( $props_n_values = array() ) {
-		return new self( $props_n_values, TRUE );
+	public static function new_instance_from_db($props_n_values = array()) {
+		return new self($props_n_values, TRUE);
 	}
 
 

core/db_classes/EE_Ticket_Price.class.php

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -35,9 +35,9 @@ 
 	 * @param string $timezone
 	 * @return EE_Ticket_Price|mixed
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = '' ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone );
-		return $has_object ? $has_object : new self( $props_n_values, FALSE, $timezone );
+	public static function new_instance($props_n_values = array(), $timezone = '') {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone);
+		return $has_object ? $has_object : new self($props_n_values, FALSE, $timezone);
 	}
 
 
@@ -47,8 +47,8 @@ 
 	 * @param string $timezone
 	 * @return EE_Ticket_Price
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = '' ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = '') {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 

core/db_classes/EE_Ticket_Template.class.php

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -35,9 +35,9 @@ 
 	 * @param string $timezone
 	 * @return EE_Ticket_Template|mixed
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = '' ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone );
-		return $has_object ? $has_object : new self( $props_n_values, FALSE, $timezone );
+	public static function new_instance($props_n_values = array(), $timezone = '') {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone);
+		return $has_object ? $has_object : new self($props_n_values, FALSE, $timezone);
 	}
 
 
@@ -47,8 +47,8 @@ 
 	 * @param string $timezone
 	 * @return EE_Ticket_Template
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = '' ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = '') {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 

core/db_classes/EE_Transaction.class.php

Braces +2 added lines, -2 removed lines

@@ -742,11 +742,11 @@
 		$pm = $this->get_first_related('Payment_Method');
 		if( $pm instanceof EE_Payment_Method ){
 			return $pm;
-		}else{
+		} else{
 			$last_payment = $this->last_payment();
 			if( $last_payment instanceof EE_Payment && $last_payment->payment_method() ){
 				return $last_payment->payment_method();
-			}else{
+			} else{
 				return NULL;
 			}
 		}

Doc Comments +6 added lines, -6 removed lines

@@ -209,7 +209,7 @@ 
 	/**
 	 *        get Transaction Total
 	 * @access        public
-	 * @return float
+	 * @return boolean
 	 */
 	public function total() {
 		return $this->get( 'TXN_total' );
@@ -220,7 +220,7 @@ 
 	/**
 	 *        get Total Amount Paid to Date
 	 * @access        public
-	 * @return float
+	 * @return boolean
 	 */
 	public function paid() {
 		return $this->get( 'TXN_paid' );
@@ -322,7 +322,7 @@ 
 	/**
 	 * Gets all the attendees for this transaction (handy for use with EE_Attendee's get_registrations_for_event function
 	 * for getting attendees and how many registrations they each have for an event)
-	 * @return mixed EE_Attendee[] by default, int if $output is set to 'COUNT'
+	 * @return EE_Base_Class[] EE_Attendee[] by default, int if $output is set to 'COUNT'
 	 */
 	public function attendees() {
 		return $this->get_many_related( 'Attendee', array( array( 'Registration.Transaction.TXN_ID' => $this->ID() ) ) );
@@ -567,7 +567,7 @@ 
 	/**
 	 * Gets all the extra meta info on this payment
 	 * @param array $query_params like EEM_Base::get_all
-	 * @return EE_Extra_Meta
+	 * @return EE_Base_Class[]
 	 */
 	public function extra_meta( $query_params = array() ) {
 		return $this->get_many_related( 'Extra_Meta', $query_params );
@@ -714,7 +714,7 @@ 
 
 	/**
 	 * Gets PMD_ID
-	 * @return int
+	 * @return boolean
 	 */
 	function payment_method_ID() {
 		return $this->get('PMD_ID');
@@ -725,7 +725,7 @@ 
 	/**
 	 * Sets PMD_ID
 	 * @param int $PMD_ID
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	function set_payment_method_ID($PMD_ID) {
 		$this->set('PMD_ID', $PMD_ID);

Spacing +112 added lines, -112 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -26,7 +26,7 @@ 
  * @subpackage 	includes/classes/EE_Transaction.class.php
  * @author 				Brent Christensen
  */
-class EE_Transaction extends EE_Base_Class implements EEI_Transaction{
+class EE_Transaction extends EE_Base_Class implements EEI_Transaction {
 
 
 	/**
@@ -35,9 +35,9 @@ 
 	 * @param string $timezone
 	 * @return EE_Transaction
 	 */
-	public static function new_instance( $props_n_values = array(), $timezone = '' ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values, FALSE, $timezone );
+	public static function new_instance($props_n_values = array(), $timezone = '') {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values, FALSE, $timezone);
 	}
 
 
@@ -48,8 +48,8 @@ 
 	 * @param string $timezone
 	 * @return EE_Transaction
 	 */
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = '' ) {
-		return new self( $props_n_values, TRUE, $timezone );
+	public static function new_instance_from_db($props_n_values = array(), $timezone = '') {
+		return new self($props_n_values, TRUE, $timezone);
 	}
 
 
@@ -64,9 +64,9 @@ 
 	 * @return 	void
 	 */
 	public function lock() {
-		$locked_transactions = get_option( 'ee_locked_transactions', array() );
-		$locked_transactions[ $this->ID() ] = true;
-		update_option( 'ee_locked_transactions', $locked_transactions );
+		$locked_transactions = get_option('ee_locked_transactions', array());
+		$locked_transactions[$this->ID()] = true;
+		update_option('ee_locked_transactions', $locked_transactions);
 	}
 
 
@@ -80,9 +80,9 @@ 
 	 * @return 	void
 	 */
 	public function unlock() {
-		$locked_transactions = get_option( 'ee_locked_transactions', array() );
-		unset( $locked_transactions[ $this->ID() ] );
-		update_option( 'ee_locked_transactions', $locked_transactions );
+		$locked_transactions = get_option('ee_locked_transactions', array());
+		unset($locked_transactions[$this->ID()]);
+		update_option('ee_locked_transactions', $locked_transactions);
 	}
 
 	/**
@@ -99,8 +99,8 @@ 
 	 * @return boolean
 	 */
 	public function is_locked() {
-		$locked_transactions = get_option( 'ee_locked_transactions', array() );
-		return isset( $locked_transactions[ $this->ID() ] ) ? true : false;
+		$locked_transactions = get_option('ee_locked_transactions', array());
+		return isset($locked_transactions[$this->ID()]) ? true : false;
 	}
 
 
@@ -111,8 +111,8 @@ 
 	 * @access        public
 	 * @param        float $total total value of transaction
 	 */
-	public function set_total( $total = 0.00 ) {
-		$this->set( 'TXN_total', $total );
+	public function set_total($total = 0.00) {
+		$this->set('TXN_total', $total);
 	}
 
 
@@ -123,8 +123,8 @@ 
 	 * @access        public
 	 * @param        float $total_paid total amount paid to date (sum of all payments)
 	 */
-	public function set_paid( $total_paid = 0.00 ) {
-		$this->set( 'TXN_paid', $total_paid );
+	public function set_paid($total_paid = 0.00) {
+		$this->set('TXN_paid', $total_paid);
 	}
 
 
@@ -135,8 +135,8 @@ 
 	 * @access        public
 	 * @param        string $status whether the transaction is open, declined, accepted, or any number of custom values that can be set
 	 */
-	public function set_status( $status = '' ) {
-		$this->set( 'STS_ID', $status );
+	public function set_status($status = '') {
+		$this->set('STS_ID', $status);
 	}
 
 
@@ -147,8 +147,8 @@ 
 	 * @access        public
 	 * @param        string $hash_salt required for some payment gateways
 	 */
-	public function set_hash_salt( $hash_salt = '' ) {
-		$this->set( 'TXN_hash_salt', $hash_salt );
+	public function set_hash_salt($hash_salt = '') {
+		$this->set('TXN_hash_salt', $hash_salt);
 	}
 
 
@@ -157,8 +157,8 @@ 
 	 * Sets TXN_reg_steps array
 	 * @param array $txn_reg_steps
 	 */
-	function set_reg_steps( $txn_reg_steps ) {
-		$this->set( 'TXN_reg_steps', $txn_reg_steps );
+	function set_reg_steps($txn_reg_steps) {
+		$this->set('TXN_reg_steps', $txn_reg_steps);
 	}
 
 
@@ -168,8 +168,8 @@ 
 	 * @return array
 	 */
 	function reg_steps() {
-		$TXN_reg_steps = $this->get( 'TXN_reg_steps' );
-		return is_array( $TXN_reg_steps ) ? $TXN_reg_steps : array();
+		$TXN_reg_steps = $this->get('TXN_reg_steps');
+		return is_array($TXN_reg_steps) ? $TXN_reg_steps : array();
 	}
 
 
@@ -179,7 +179,7 @@ 
 	 * @return string of transaction's total cost, with currency symbol and decimal
 	 */
 	public function pretty_total() {
-		return $this->get_pretty( 'TXN_total' );
+		return $this->get_pretty('TXN_total');
 	}
 
 
@@ -189,7 +189,7 @@ 
 	 * @return string
 	 */
 	public function pretty_paid() {
-		return $this->get_pretty( 'TXN_paid' );
+		return $this->get_pretty('TXN_paid');
 	}
 
 
@@ -201,7 +201,7 @@ 
 	 * @return float amount remaining
 	 */
 	public function remaining() {
-		return (float)( $this->total() - $this->paid() );
+		return (float) ($this->total() - $this->paid());
 	}
 
 
@@ -212,7 +212,7 @@ 
 	 * @return float
 	 */
 	public function total() {
-		return $this->get( 'TXN_total' );
+		return $this->get('TXN_total');
 	}
 
 
@@ -223,7 +223,7 @@ 
 	 * @return float
 	 */
 	public function paid() {
-		return $this->get( 'TXN_paid' );
+		return $this->get('TXN_paid');
 	}
 
 
@@ -233,8 +233,8 @@ 
 	 * @access        public
 	 */
 	public function get_cart_session() {
-		$session_data = $this->get( 'TXN_session_data' );
-		return isset( $session_data[ 'cart' ] ) && $session_data[ 'cart' ] instanceof EE_Cart ? $session_data[ 'cart' ] : NULL;
+		$session_data = $this->get('TXN_session_data');
+		return isset($session_data['cart']) && $session_data['cart'] instanceof EE_Cart ? $session_data['cart'] : NULL;
 	}
 
 
@@ -244,9 +244,9 @@ 
 	 * @access        public
 	 */
 	public function session_data() {
-		$session_data = $this->get( 'TXN_session_data' );
-		if ( empty( $session_data ) ) {
-			$session_data = array( 'id' => NULL, 'user_id' => NULL, 'ip_address' => NULL, 'user_agent' => NULL, 'init_access' => NULL, 'last_access' => NULL, 'pages_visited' => array() );
+		$session_data = $this->get('TXN_session_data');
+		if (empty($session_data)) {
+			$session_data = array('id' => NULL, 'user_id' => NULL, 'ip_address' => NULL, 'user_agent' => NULL, 'init_access' => NULL, 'last_access' => NULL, 'pages_visited' => array());
 		}
 		return $session_data;
 	}
@@ -259,11 +259,11 @@ 
 	 * @access        public
 	 * @param        EE_Session|array $session_data
 	 */
-	public function set_txn_session_data( $session_data ) {
-		if ( $session_data instanceof EE_Session ) {
-			$this->set( 'TXN_session_data', $session_data->get_session_data( NULL, TRUE ));
+	public function set_txn_session_data($session_data) {
+		if ($session_data instanceof EE_Session) {
+			$this->set('TXN_session_data', $session_data->get_session_data(NULL, TRUE));
 		} else {
-			$this->set( 'TXN_session_data', $session_data );
+			$this->set('TXN_session_data', $session_data);
 		}
 	}
 
@@ -274,7 +274,7 @@ 
 	 * @access        public
 	 */
 	public function hash_salt_() {
-		return $this->get( 'TXN_hash_salt' );
+		return $this->get('TXN_hash_salt');
 	}
 
 
@@ -293,13 +293,13 @@ 
 	 * @param 	boolean 	$gmt - whether to return a unix timestamp with UTC offset applied (default) or no UTC offset applied
 	 * @return 	string | int
 	 */
-	public function datetime( $format = FALSE, $gmt = FALSE ) {
-		if ( $format ) {
-			return $this->get_pretty( 'TXN_timestamp' );
-		} else if ( $gmt ) {
-			return $this->get_raw( 'TXN_timestamp' );
+	public function datetime($format = FALSE, $gmt = FALSE) {
+		if ($format) {
+			return $this->get_pretty('TXN_timestamp');
+		} else if ($gmt) {
+			return $this->get_raw('TXN_timestamp');
 		} else {
-			return $this->get( 'TXN_timestamp' );
+			return $this->get('TXN_timestamp');
 		}
 	}
 
@@ -311,10 +311,10 @@ 
 	 * @param        boolean $get_cached   TRUE to retrieve cached registrations or FALSE to pull from the db
 	 * @return EE_Registration[]
 	 */
-	public function registrations( $query_params = array(), $get_cached = FALSE ) {
-		$query_params = ( empty( $query_params ) || ! is_array( $query_params ) ) ? array( 'order_by' => array( 'Event.EVT_name' => 'ASC', 'Attendee.ATT_lname' => 'ASC', 'Attendee.ATT_fname' => 'ASC' ) ) : $query_params;
+	public function registrations($query_params = array(), $get_cached = FALSE) {
+		$query_params = (empty($query_params) || ! is_array($query_params)) ? array('order_by' => array('Event.EVT_name' => 'ASC', 'Attendee.ATT_lname' => 'ASC', 'Attendee.ATT_fname' => 'ASC')) : $query_params;
 		$query_params = $get_cached ? array() : $query_params;
-		return $this->get_many_related( 'Registration', $query_params );
+		return $this->get_many_related('Registration', $query_params);
 	}
 
 
@@ -325,7 +325,7 @@ 
 	 * @return mixed EE_Attendee[] by default, int if $output is set to 'COUNT'
 	 */
 	public function attendees() {
-		return $this->get_many_related( 'Attendee', array( array( 'Registration.Transaction.TXN_ID' => $this->ID() ) ) );
+		return $this->get_many_related('Attendee', array(array('Registration.Transaction.TXN_ID' => $this->ID())));
 	}
 
 
@@ -335,8 +335,8 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return EE_Payment[]
 	 */
-	public function payments( $query_params = array() ) {
-		return $this->get_many_related( 'Payment', $query_params );
+	public function payments($query_params = array()) {
+		return $this->get_many_related('Payment', $query_params);
 	}
 
 
@@ -346,8 +346,8 @@ 
 	 * @return EE_Payment[]
 	 */
 	public function approved_payments() {
-		EE_Registry::instance()->load_model( 'Payment' );
-		return $this->get_many_related( 'Payment', array( array( 'STS_ID' => EEM_Payment::status_id_approved ), 'order_by' => array( 'PAY_timestamp' => 'DESC' ) ) );
+		EE_Registry::instance()->load_model('Payment');
+		return $this->get_many_related('Payment', array(array('STS_ID' => EEM_Payment::status_id_approved), 'order_by' => array('PAY_timestamp' => 'DESC')));
 	}
 
 
@@ -357,8 +357,8 @@ 
 	 * @param bool $show_icons
 	 * @return string
 	 */
-	public function e_pretty_status( $show_icons = FALSE ) {
-		echo $this->pretty_status( $show_icons );
+	public function e_pretty_status($show_icons = FALSE) {
+		echo $this->pretty_status($show_icons);
 	}
 
 
@@ -368,10 +368,10 @@ 
 	 * @param bool $show_icons
 	 * @return string
 	 */
-	public function pretty_status( $show_icons = FALSE ) {
-		$status = EEM_Status::instance()->localized_status( array( $this->status_ID() => __( 'unknown', 'event_espresso' ) ), FALSE, 'sentence' );
+	public function pretty_status($show_icons = FALSE) {
+		$status = EEM_Status::instance()->localized_status(array($this->status_ID() => __('unknown', 'event_espresso')), FALSE, 'sentence');
 		$icon = '';
-		switch ( $this->status_ID() ) {
+		switch ($this->status_ID()) {
 			case EEM_Transaction::complete_status_code:
 				$icon = $show_icons ? '<span class="dashicons dashicons-yes ee-icon-size-24 green-text"></span>' : '';
 				break;
@@ -388,7 +388,7 @@ 
 				$icon = $show_icons ? '<span class="dashicons dashicons-plus ee-icon-size-16 orange-text"></span>' : '';
 				break;
 		}
-		return $icon . $status[ $this->status_ID() ];
+		return $icon.$status[$this->status_ID()];
 	}
 
 
@@ -398,7 +398,7 @@ 
 	 * @access        public
 	 */
 	public function status_ID() {
-		return $this->get( 'STS_ID' );
+		return $this->get('STS_ID');
 	}
 
 
@@ -408,7 +408,7 @@ 
 	 * @return boolean
 	 */
 	public function is_free() {
-		return (float)$this->get( 'TXN_total' ) == 0 ? TRUE : FALSE;
+		return (float) $this->get('TXN_total') == 0 ? TRUE : FALSE;
 	}
 
 
@@ -476,12 +476,12 @@ 
 	 * @access public
 	 * @return string
 	 */
-	public function invoice_url( $type = 'html' ) {
+	public function invoice_url($type = 'html') {
 		$REG = $this->primary_registration();
-		if ( ! $REG instanceof EE_Registration ) {
+		if ( ! $REG instanceof EE_Registration) {
 			return '';
 		}
-		return $REG->invoice_url( $type );
+		return $REG->invoice_url($type);
 	}
 
 
@@ -491,7 +491,7 @@ 
 	 * @return EE_Registration
 	 */
 	public function primary_registration() {
-		return $this->get_first_related( 'Registration', array( array( 'REG_count' => EEM_Registration::PRIMARY_REGISTRANT_COUNT ) ) );
+		return $this->get_first_related('Registration', array(array('REG_count' => EEM_Registration::PRIMARY_REGISTRANT_COUNT)));
 	}
 
 
@@ -501,12 +501,12 @@ 
 	 * @param string $type 'pdf' or 'html' (default is 'html')
 	 * @return string
 	 */
-	public function receipt_url( $type = 'html' ) {
+	public function receipt_url($type = 'html') {
 		$REG = $this->primary_registration();
-		if ( ! $REG instanceof EE_Registration ) {
+		if ( ! $REG instanceof EE_Registration) {
 			return '';
 		}
-		return $REG->receipt_url( $type );
+		return $REG->receipt_url($type);
 	}
 
 
@@ -531,15 +531,15 @@ 
 	 * @deprecated
 	 * @return boolean
 	 */
-	public function update_based_on_payments(){
+	public function update_based_on_payments() {
 		EE_Error::doing_it_wrong(
-			__CLASS__ . '::' . __FUNCTION__,
-			sprintf( __( 'This method is deprecated. Please use "%s" instead', 'event_espresso' ), 'EE_Transaction_Processor::update_transaction_and_registrations_after_checkout_or_payment()' ),
+			__CLASS__.'::'.__FUNCTION__,
+			sprintf(__('This method is deprecated. Please use "%s" instead', 'event_espresso'), 'EE_Transaction_Processor::update_transaction_and_registrations_after_checkout_or_payment()'),
 			'4.6.0'
 		);
 		/** @type EE_Transaction_Processor $transaction_processor */
-		$transaction_processor = EE_Registry::instance()->load_class( 'Transaction_Processor' );
-		return  $transaction_processor->update_transaction_and_registrations_after_checkout_or_payment( $this );
+		$transaction_processor = EE_Registry::instance()->load_class('Transaction_Processor');
+		return  $transaction_processor->update_transaction_and_registrations_after_checkout_or_payment($this);
 	}
 
 
@@ -548,7 +548,7 @@ 
 	 * @return string
 	 */
 	public function gateway_response_on_transaction() {
-		$payment = $this->get_first_related( 'Payment' );
+		$payment = $this->get_first_related('Payment');
 		return $payment instanceof EE_Payment ? $payment->gateway_response() : '';
 	}
 
@@ -559,7 +559,7 @@ 
 	 * @return EE_Status
 	 */
 	public function status_obj() {
-		return $this->get_first_related( 'Status' );
+		return $this->get_first_related('Status');
 	}
 
 
@@ -569,8 +569,8 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return EE_Extra_Meta
 	 */
-	public function extra_meta( $query_params = array() ) {
-		return $this->get_many_related( 'Extra_Meta', $query_params );
+	public function extra_meta($query_params = array()) {
+		return $this->get_many_related('Extra_Meta', $query_params);
 	}
 
 
@@ -580,8 +580,8 @@ 
 	 * @param EE_Registration $registration
 	 * @return EE_Base_Class the relation was added to
 	 */
-	public function add_registration( EE_Registration $registration ) {
-		return $this->_add_relation_to( $registration, 'Registration' );
+	public function add_registration(EE_Registration $registration) {
+		return $this->_add_relation_to($registration, 'Registration');
 	}
 
 
@@ -592,8 +592,8 @@ 
 	 * @param int $registration_or_id
 	 * @return EE_Base_Class that was removed from being related
 	 */
-	public function remove_registration_with_id( $registration_or_id ) {
-		return $this->_remove_relation_to( $registration_or_id, 'Registration' );
+	public function remove_registration_with_id($registration_or_id) {
+		return $this->_remove_relation_to($registration_or_id, 'Registration');
 	}
 
 
@@ -603,7 +603,7 @@ 
 	 * @return EE_Line_Item[]
 	 */
 	public function items_purchased() {
-		return $this->line_items( array( array( 'LIN_type' => EEM_Line_Item::type_line_item ) ) );
+		return $this->line_items(array(array('LIN_type' => EEM_Line_Item::type_line_item)));
 	}
 
 
@@ -613,8 +613,8 @@ 
 	 * @param EE_Line_Item $line_item
 	 * @return EE_Base_Class the relation was added to
 	 */
-	public function add_line_item( EE_Line_Item $line_item ) {
-		return $this->_add_relation_to( $line_item, 'Line_Item' );
+	public function add_line_item(EE_Line_Item $line_item) {
+		return $this->_add_relation_to($line_item, 'Line_Item');
 	}
 
 
@@ -624,8 +624,8 @@ 
 	 * @param array $query_params
 	 * @return EE_Line_Item[]
 	 */
-	public function line_items( $query_params = array() ) {
-		return $this->get_many_related( 'Line_Item', $query_params );
+	public function line_items($query_params = array()) {
+		return $this->get_many_related('Line_Item', $query_params);
 	}
 
 
@@ -635,7 +635,7 @@ 
 	 * @return EE_Line_Item[]
 	 */
 	public function tax_items() {
-		return $this->line_items( array( array( 'LIN_type' => EEM_Line_Item::type_tax ) ) );
+		return $this->line_items(array(array('LIN_type' => EEM_Line_Item::type_tax)));
 	}
 
 
@@ -646,9 +646,9 @@ 
 	 * @return EE_Line_Item
 	 */
 	public function total_line_item() {
-		$item =  $this->get_first_related( 'Line_Item', array( array( 'LIN_type' => EEM_Line_Item::type_total ) ) );
-		if( ! $item ){
-			EE_Registry::instance()->load_helper( 'Line_Item' );
+		$item = $this->get_first_related('Line_Item', array(array('LIN_type' => EEM_Line_Item::type_total)));
+		if ( ! $item) {
+			EE_Registry::instance()->load_helper('Line_Item');
 			$item = EEH_Line_Item::create_default_total_line_item();
 		}
 		return $item;
@@ -663,7 +663,7 @@ 
 	 */
 	public function tax_total() {
 		$tax_line_item = $this->tax_total_line_item();
-		if ( $tax_line_item ) {
+		if ($tax_line_item) {
 			return $tax_line_item->total();
 		} else {
 			return 0;
@@ -677,9 +677,9 @@ 
 	 * @return EE_Line_Item
 	 */
 	public function tax_total_line_item() {
-		$item =  $this->get_first_related( 'Line_Item', array( array( 'LIN_type' => EEM_Line_Item::type_tax_sub_total ) ) );
-		if( ! $item ){
-			EE_Registry::instance()->load_helper( 'Line_Item' );
+		$item = $this->get_first_related('Line_Item', array(array('LIN_type' => EEM_Line_Item::type_tax_sub_total)));
+		if ( ! $item) {
+			EE_Registry::instance()->load_helper('Line_Item');
 			$item = EEH_Line_Item::create_default_total_line_item();
 		}
 		return $item;
@@ -691,20 +691,20 @@ 
 	 *  Gets the array of billing info for the gateway and for this transaction's primary registration's attendee.
 	 * @return EE_Form_Section_Proper
 	 */
-	public function billing_info(){
+	public function billing_info() {
 		$payment_method = $this->payment_method();
-		if ( !$payment_method){
+		if ( ! $payment_method) {
 			EE_Error::add_error(__("Could not find billing info for transaction because no gateway has been used for it yet", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
 			return false;
 		}
 		$primary_reg = $this->primary_registration();
-		if ( ! $primary_reg ) {
-			EE_Error::add_error( __( "Cannot get billing info for gateway %s on transaction because no primary registration exists", "event_espresso" ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $primary_reg) {
+			EE_Error::add_error(__("Cannot get billing info for gateway %s on transaction because no primary registration exists", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		$attendee = $primary_reg->attendee();
-		if ( ! $attendee ) {
-			EE_Error::add_error( __( "Cannot get billing info for gateway %s on transaction because the primary registration has no attendee exists", "event_espresso" ), __FILE__, __FUNCTION__, __LINE__ );
+		if ( ! $attendee) {
+			EE_Error::add_error(__("Cannot get billing info for gateway %s on transaction because the primary registration has no attendee exists", "event_espresso"), __FILE__, __FUNCTION__, __LINE__);
 			return FALSE;
 		}
 		return $attendee->billing_info_for_payment_method($payment_method);
@@ -739,15 +739,15 @@ 
 	 * offline ones, dont' create payments)
 	 * @return EE_Payment_Method
 	 */
-	function payment_method(){
+	function payment_method() {
 		$pm = $this->get_first_related('Payment_Method');
-		if( $pm instanceof EE_Payment_Method ){
+		if ($pm instanceof EE_Payment_Method) {
 			return $pm;
-		}else{
+		} else {
 			$last_payment = $this->last_payment();
-			if( $last_payment instanceof EE_Payment && $last_payment->payment_method() ){
+			if ($last_payment instanceof EE_Payment && $last_payment->payment_method()) {
 				return $last_payment->payment_method();
-			}else{
+			} else {
 				return NULL;
 			}
 		}
@@ -758,15 +758,15 @@ 
 	 * @return EE_Payment
 	 */
 	public function last_payment() {
-		return $this->get_first_related( 'Payment', array( 'order_by' => array( 'PAY_ID' => 'desc' ) ) );
+		return $this->get_first_related('Payment', array('order_by' => array('PAY_ID' => 'desc')));
 	}
 
 	/**
 	 * Gets all the line items which are unrelated to tickets on this transaction
 	 * @return EE_Line_Item[]
 	 */
-	public function non_ticket_line_items(){
-		return EEM_Line_Item::instance()->get_all_non_ticket_line_items_for_transaction( $this->ID() );
+	public function non_ticket_line_items() {
+		return EEM_Line_Item::instance()->get_all_non_ticket_line_items_for_transaction($this->ID());
 	}
 
 

core/db_classes/EE_WP_User.class.php

Spacing +9 added lines, -9 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  * EE_WP_User class
@@ -22,9 +22,9 @@ 
 	 * @param array $props_n_values
 	 * @return EE_WP_User|mixed
 	 */
-	public static function new_instance( $props_n_values = array() ) {
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
-		return $has_object ? $has_object : new self( $props_n_values );
+	public static function new_instance($props_n_values = array()) {
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
+		return $has_object ? $has_object : new self($props_n_values);
 	}
 
 
@@ -33,8 +33,8 @@ 
 	 * @param array $props_n_values
 	 * @return EE_WP_User
 	 */
-	public static function new_instance_from_db( $props_n_values = array() ) {
-		return new self( $props_n_values, TRUE );
+	public static function new_instance_from_db($props_n_values = array()) {
+		return new self($props_n_values, TRUE);
 	}
 
 	/**
@@ -42,8 +42,8 @@ 
 	 * @return WP_User
 	 */
 	public function wp_user_obj() {
-		if( ! $this->_wp_user_obj ) {
-			$this->_wp_user_obj = get_user_by('ID', $this->ID() );
+		if ( ! $this->_wp_user_obj) {
+			$this->_wp_user_obj = get_user_by('ID', $this->ID());
 		}
 		return $this->_wp_user_obj;
 	}

core/db_models/EEM_Answer.model.php

Braces +7 added lines, -5 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *
@@ -89,7 +91,7 @@ 
 			if( $answer_obj instanceof EE_Answer ){
 				if($pretty_answer){
 					$value = $answer_obj->pretty_value();
-				}else{
+				} else{
 					$value = $answer_obj->value();
 				}
 			}
@@ -129,13 +131,13 @@ 
 				if($field_name == 'STA_ID'){
 					$state = $registration->attendee()->state_obj();
 					$value = $state instanceof EE_State ? $state->name() : sprintf(__('Unknown State (%s)', 'event_espresso'),$registration->attendee()->state_ID());
-				}else if($field_name == 'CNT_ISO'){
+				} else if($field_name == 'CNT_ISO'){
 					$country = $registration->attendee()->country_obj();
 					$value = $country instanceof EE_Country ? $country->name() : sprintf(__('Unknown Country (%s)', "event_espresso"),$registration->attendee()->country_ID());
-				}else{
+				} else{
 					$value = $registration->attendee()->get_pretty($field_name);
 				}
-			}else{
+			} else{
 				$value = $registration->attendee()->get($field_name);
 			}
 		}

Spacing +29 added lines, -29 removed lines

@@ -50,18 +50,18 @@ 
 	/**
 	 * 	constructor
 	 */
-	protected function __construct( $timezone = NULL ){
-		$this->singular_item = __('Answer','event_espresso');
-		$this->plural_item = __('Answers','event_espresso');
+	protected function __construct($timezone = NULL) {
+		$this->singular_item = __('Answer', 'event_espresso');
+		$this->plural_item = __('Answers', 'event_espresso');
 		$this->_tables = array(
 			'Answer'=> new EE_Primary_Table('esp_answer', 'ANS_ID')
 		);
 		$this->_fields = array(
 			'Answer'=>array(
-				'ANS_ID'=> new EE_Primary_Key_Int_Field('ANS_ID', __('Answer ID','event_espresso')),
-				'REG_ID'=>new EE_Foreign_Key_Int_Field('REG_ID', __('Registration ID','event_espresso'), false, 0, 'Registration'),
-				'QST_ID'=>new EE_Foreign_Key_Int_Field('QST_ID', __('Question ID','event_espresso'), false, 0, 'Question'),
-				'ANS_value'=>new EE_Maybe_Serialized_Text_Field('ANS_value', __('Answer Value','event_espresso'), false, '')
+				'ANS_ID'=> new EE_Primary_Key_Int_Field('ANS_ID', __('Answer ID', 'event_espresso')),
+				'REG_ID'=>new EE_Foreign_Key_Int_Field('REG_ID', __('Registration ID', 'event_espresso'), false, 0, 'Registration'),
+				'QST_ID'=>new EE_Foreign_Key_Int_Field('QST_ID', __('Question ID', 'event_espresso'), false, 0, 'Question'),
+				'ANS_value'=>new EE_Maybe_Serialized_Text_Field('ANS_value', __('Answer Value', 'event_espresso'), false, '')
 			));
 		$this->_model_relations = array(
 			'Registration'=>new EE_Belongs_To_Relation(),
@@ -69,7 +69,7 @@ 
 		);
 		$this->_model_chain_to_wp_user = 'Registration.Event';
 		$this->_caps_slug = 'registrations';
-		parent::__construct( $timezone );
+		parent::__construct($timezone);
 	}
 
 
@@ -82,19 +82,19 @@ 
 	 * @param boolean $pretty_answer whether to call 'pretty_value' or just 'value'
 	 * @return string
 	 */
-	public function get_answer_value_to_question( EE_Registration $registration, $question_id = NULL,$pretty_answer = FALSE ){
-		$value = $this->get_attendee_property_answer_value( $registration, $question_id, $pretty_answer );
-		if (  $value === NULL ){
-			$answer_obj = $this->get_registration_question_answer_object( $registration, $question_id, $pretty_answer );
-			if( $answer_obj instanceof EE_Answer ){
-				if($pretty_answer){
+	public function get_answer_value_to_question(EE_Registration $registration, $question_id = NULL, $pretty_answer = FALSE) {
+		$value = $this->get_attendee_property_answer_value($registration, $question_id, $pretty_answer);
+		if ($value === NULL) {
+			$answer_obj = $this->get_registration_question_answer_object($registration, $question_id, $pretty_answer);
+			if ($answer_obj instanceof EE_Answer) {
+				if ($pretty_answer) {
 					$value = $answer_obj->pretty_value();
-				}else{
+				} else {
 					$value = $answer_obj->value();
 				}
 			}
 		}
-		return apply_filters( 'FHEE__EEM_Answer__get_answer_value_to_question__answer_value', $value, $registration, $question_id );
+		return apply_filters('FHEE__EEM_Answer__get_answer_value_to_question__answer_value', $value, $registration, $question_id);
 	}
 
 
@@ -105,9 +105,9 @@ 
 	 * @param int $question_id
 	 * @return EE_Answer
 	 */
-	public function get_registration_question_answer_object( EE_Registration $registration, $question_id = NULL){
-		$answer_obj = $this->get_one( array( array( 'QST_ID'=>$question_id, 'REG_ID'=>$registration->ID() )));
-		return apply_filters( 'FHEE__EEM_Answer__get_registration_question_answer_object__answer_obj', $answer_obj, $registration, $question_id );
+	public function get_registration_question_answer_object(EE_Registration $registration, $question_id = NULL) {
+		$answer_obj = $this->get_one(array(array('QST_ID'=>$question_id, 'REG_ID'=>$registration->ID())));
+		return apply_filters('FHEE__EEM_Answer__get_registration_question_answer_object__answer_obj', $answer_obj, $registration, $question_id);
 	}
 
 
@@ -119,27 +119,27 @@ 
 	 * @param boolean $pretty_answer
 	 * @return string
 	 */
-	public function get_attendee_property_answer_value( EE_Registration $registration, $question_id = NULL, $pretty_answer = FALSE ){
+	public function get_attendee_property_answer_value(EE_Registration $registration, $question_id = NULL, $pretty_answer = FALSE) {
 		$field_name = NULL;
 		$value = NULL;
 		//only bother checking if the registration has an attendee
-		if( $registration->attendee() instanceof EE_Attendee && isset($this->_question_id_to_att_field_map[$question_id])){
+		if ($registration->attendee() instanceof EE_Attendee && isset($this->_question_id_to_att_field_map[$question_id])) {
 			$field_name = $this->_question_id_to_att_field_map[$question_id];
-			if($pretty_answer){
-				if($field_name == 'STA_ID'){
+			if ($pretty_answer) {
+				if ($field_name == 'STA_ID') {
 					$state = $registration->attendee()->state_obj();
-					$value = $state instanceof EE_State ? $state->name() : sprintf(__('Unknown State (%s)', 'event_espresso'),$registration->attendee()->state_ID());
-				}else if($field_name == 'CNT_ISO'){
+					$value = $state instanceof EE_State ? $state->name() : sprintf(__('Unknown State (%s)', 'event_espresso'), $registration->attendee()->state_ID());
+				} else if ($field_name == 'CNT_ISO') {
 					$country = $registration->attendee()->country_obj();
-					$value = $country instanceof EE_Country ? $country->name() : sprintf(__('Unknown Country (%s)', "event_espresso"),$registration->attendee()->country_ID());
-				}else{
+					$value = $country instanceof EE_Country ? $country->name() : sprintf(__('Unknown Country (%s)', "event_espresso"), $registration->attendee()->country_ID());
+				} else {
 					$value = $registration->attendee()->get_pretty($field_name);
 				}
-			}else{
+			} else {
 				$value = $registration->attendee()->get($field_name);
 			}
 		}
-		return apply_filters( 'FHEE__EEM_Answer__get_attendee_question_answer_value__answer_value', $value, $registration, $question_id );
+		return apply_filters('FHEE__EEM_Answer__get_attendee_question_answer_value__answer_value', $value, $registration, $question_id);
 	}
 
 

core/db_models/EEM_Base.model.php

Indentation +4 added lines, -4 removed lines

@@ -555,10 +555,10 @@
 	 	$stati = EEM_Status::instance()->get_all(array(array('STS_type' => $status_type) ) );
 	 	$status_array = array();
 	 	foreach ( $stati as $status ) {
-            $status_array[ $status->ID() ] = $status->get('STS_code');
-        }
-        return $translated ? EEM_Status::instance()->localized_status($status_array, FALSE, 'sentence') : $status_array;
-    }
+			$status_array[ $status->ID() ] = $status->get('STS_code');
+		}
+		return $translated ? EEM_Status::instance()->localized_status($status_array, FALSE, 'sentence') : $status_array;
+	}
 
 
 

Spacing +885 added lines, -885 removed lines

@@ -23,7 +23,7 @@ 
  * @since 				EE4
  *
  */
-abstract class EEM_Base extends EE_Base{
+abstract class EEM_Base extends EE_Base {
 
 		//admin posty
 	//basic -> grants access to mine -> if they don't have it, select none
@@ -228,7 +228,7 @@ 
 	 * Flag indicating whether this model has a primary key or not
 	 * @var boolean
 	 */
-	protected $_has_primary_key_field=null;
+	protected $_has_primary_key_field = null;
 
 	/**
 	 * Whether or not this model is based off a table in WP core only (CPTs should set
@@ -283,19 +283,19 @@ 
 	 * operators that work like 'BETWEEN'.  Typically used for datetime calculations, i.e. "BETWEEN '12-1-2011' AND '12-31-2012'"
 	 * @var array
 	 */
-	protected $_between_style_operators = array( 'BETWEEN' );
+	protected $_between_style_operators = array('BETWEEN');
 
 	/**
 	 * operators that are used for handling NUll and !NULL queries.  Typically used for when checking if a row exists on a join table.
 	 * @var array
 	 */
-	protected $_null_style_operators = array( 'IS NOT NULL', 'IS NULL');
+	protected $_null_style_operators = array('IS NOT NULL', 'IS NULL');
 
 	/**
 	 * Allowed values for $query_params['order'] for ordering in queries
 	 * @var array
 	 */
-	protected $_allowed_order_values = array('asc','desc','ASC','DESC');
+	protected $_allowed_order_values = array('asc', 'desc', 'ASC', 'DESC');
 
 	/**
 	 * When these are keys in a WHERE or HAVING clause, they are handled much differently
@@ -309,13 +309,13 @@ 
 	 * 'where', but 'where' clauses are so common that we thought we'd omit it
 	 * @var array
 	 */
-	private $_allowed_query_params = array(0, 'limit','order_by','group_by','having','force_join','order','on_join_limit','default_where_conditions', 'caps');
+	private $_allowed_query_params = array(0, 'limit', 'order_by', 'group_by', 'having', 'force_join', 'order', 'on_join_limit', 'default_where_conditions', 'caps');
 
 	/**
 	 * All the data types that can be used in $wpdb->prepare statements.
 	 * @var array
 	 */
-	private $_valid_wpdb_data_types = array('%d','%s','%f');
+	private $_valid_wpdb_data_types = array('%d', '%s', '%f');
 
 	/**
 	 * 	EE_Registry Object
@@ -373,13 +373,13 @@ 
 	 * @param null $timezone
 	 * @throws \EE_Error
 	 */
-	protected function __construct( $timezone = NULL ){
+	protected function __construct($timezone = NULL) {
 		// check that the model has not been loaded too soon
-		if ( ! did_action( 'AHEE__EE_System__load_espresso_addons' )) {
-			throw new EE_Error (
+		if ( ! did_action('AHEE__EE_System__load_espresso_addons')) {
+			throw new EE_Error(
 				sprintf(
-					__( 'The %1$s model can not be loaded before the "AHEE__EE_System__load_espresso_addons" hook has been called. This gives other addons a chance to extend this model.', 'event_espresso' ),
-					get_class( $this )
+					__('The %1$s model can not be loaded before the "AHEE__EE_System__load_espresso_addons" hook has been called. This gives other addons a chance to extend this model.', 'event_espresso'),
+					get_class($this)
 				)
 			);
 		}
@@ -389,11 +389,11 @@ 
 		 * just use EE_Register_Model_Extension
 		 * @var EE_Table_Base[] $_tables
 		 */
-		$this->_tables = apply_filters( 'FHEE__'.get_class($this).'__construct__tables', $this->_tables );
-		foreach($this->_tables as $table_alias => $table_obj){
+		$this->_tables = apply_filters('FHEE__'.get_class($this).'__construct__tables', $this->_tables);
+		foreach ($this->_tables as $table_alias => $table_obj) {
 			/** @var $table_obj EE_Table_Base */
 			$table_obj->_construct_finalize_with_alias($table_alias);
-			if( $table_obj instanceof EE_Secondary_Table ){
+			if ($table_obj instanceof EE_Secondary_Table) {
 				/** @var $table_obj EE_Secondary_Table */
 				$table_obj->_construct_finalize_set_table_to_join_with($this->_get_main_table());
 			}
@@ -403,48 +403,48 @@ 
 		 * EE_Register_Model_Extension
 		 * @param EE_Model_Field_Base[] $_fields
 		 */
-		$this->_fields = apply_filters('FHEE__'.get_class($this).'__construct__fields',$this->_fields);
-		foreach($this->_fields as $table_alias => $fields_for_table){
-			if ( ! array_key_exists( $table_alias, $this->_tables )){
-				throw new EE_Error(sprintf(__("Table alias %s does not exist in EEM_Base child's _tables array. Only tables defined are %s",'event_espresso'),$table_alias,implode(",",$this->_fields)));
+		$this->_fields = apply_filters('FHEE__'.get_class($this).'__construct__fields', $this->_fields);
+		foreach ($this->_fields as $table_alias => $fields_for_table) {
+			if ( ! array_key_exists($table_alias, $this->_tables)) {
+				throw new EE_Error(sprintf(__("Table alias %s does not exist in EEM_Base child's _tables array. Only tables defined are %s", 'event_espresso'), $table_alias, implode(",", $this->_fields)));
 			}
-			foreach($fields_for_table as $field_name => $field_obj){
+			foreach ($fields_for_table as $field_name => $field_obj) {
 				/** @var $field_obj EE_Model_Field_Base | EE_Primary_Key_Field_Base */
 				//primary key field base has a slightly different _construct_finalize
 				/** @var $field_obj EE_Model_Field_Base */
-				$field_obj->_construct_finalize( $table_alias, $field_name, $this->get_this_model_name() );
+				$field_obj->_construct_finalize($table_alias, $field_name, $this->get_this_model_name());
 			}
 		}
 
 		// everything is related to Extra_Meta
-		if( get_class($this) != 'EEM_Extra_Meta'){
+		if (get_class($this) != 'EEM_Extra_Meta') {
 			//make extra meta related to everything, but don't block deleting things just
 			//because they have related extra meta info. For now just orphan those extra meta
 			//in the future we should automatically delete them
-			$this->_model_relations['Extra_Meta'] = new EE_Has_Many_Any_Relation( FALSE );
+			$this->_model_relations['Extra_Meta'] = new EE_Has_Many_Any_Relation(FALSE);
 		}
 		//and change logs
-		if( get_class( $this) !=  'EEM_Change_Log' ) {
-			$this->_model_relations[ 'Change_Log' ] = new EE_Has_Many_Any_Relation( FALSE );
+		if (get_class($this) != 'EEM_Change_Log') {
+			$this->_model_relations['Change_Log'] = new EE_Has_Many_Any_Relation(FALSE);
 		}
 		/**
 		 * Filters the list of relations on a model. It is best to NOT use this directly and instead just use
 		 * EE_Register_Model_Extension
 		 * @param EE_Model_Relation_Base[] $_model_relations
 		 */
-		$this->_model_relations = apply_filters('FHEE__'.get_class($this).'__construct__model_relations',$this->_model_relations);
-		foreach($this->_model_relations as $model_name => $relation_obj){
+		$this->_model_relations = apply_filters('FHEE__'.get_class($this).'__construct__model_relations', $this->_model_relations);
+		foreach ($this->_model_relations as $model_name => $relation_obj) {
 			/** @var $relation_obj EE_Model_Relation_Base */
 			$relation_obj->_construct_finalize_set_models($this->get_this_model_name(), $model_name);
 		}
-		foreach($this->_indexes as $index_name => $index_obj){
+		foreach ($this->_indexes as $index_name => $index_obj) {
 			/** @var $index_obj EE_Index */
 			$index_obj->_construct_finalize($index_name, $this->get_this_model_name());
 		}
 
 		$this->set_timezone($timezone);
 		//finalize default where condition strategy, or set default
-		if( ! $this->_default_where_conditions_strategy){
+		if ( ! $this->_default_where_conditions_strategy) {
 			//nothing was set during child constructor, so set default
 			$this->_default_where_conditions_strategy = new EE_Default_Where_Conditions();
 		}
@@ -452,15 +452,15 @@ 
 
 		//if the cap slug hasn't been set, and we haven't set it to false on purpose
 		//to indicate to NOT set it, set it to the logical default
-		if( $this->_caps_slug === null ) {
-			EE_Registry::instance()->load_helper( 'Inflector' );
-			$this->_caps_slug = EEH_Inflector::pluralize_and_lower( $this->get_this_model_name() );
+		if ($this->_caps_slug === null) {
+			EE_Registry::instance()->load_helper('Inflector');
+			$this->_caps_slug = EEH_Inflector::pluralize_and_lower($this->get_this_model_name());
 		}
 		//initialize the standard cap restriction generators if none were specified by the child constructor
-		if( $this->_cap_restriction_generators !== false ){
-			foreach( $this->cap_contexts_to_cap_action_map() as $cap_context => $action ){
-				if( ! isset( $this->_cap_restriction_generators[ $cap_context ] ) ) {
-					$this->_cap_restriction_generators[ $cap_context ] = apply_filters(
+		if ($this->_cap_restriction_generators !== false) {
+			foreach ($this->cap_contexts_to_cap_action_map() as $cap_context => $action) {
+				if ( ! isset($this->_cap_restriction_generators[$cap_context])) {
+					$this->_cap_restriction_generators[$cap_context] = apply_filters(
 						'FHEE__EEM_Base___construct__standard_cap_restriction_generator',
 						new EE_Restriction_Generator_Protected(),
 						$cap_context,
@@ -470,23 +470,23 @@ 
 			}
 		}
 		//if there are cap restriction generators, use them to make the default cap restrictions
-		if( $this->_cap_restriction_generators !== false ){
-			foreach( $this->_cap_restriction_generators as $context => $generator_object ) {
-				if( ! $generator_object ){
+		if ($this->_cap_restriction_generators !== false) {
+			foreach ($this->_cap_restriction_generators as $context => $generator_object) {
+				if ( ! $generator_object) {
 					continue;
 				}
-				if( ! $generator_object instanceof EE_Restriction_Generator_Base ){
+				if ( ! $generator_object instanceof EE_Restriction_Generator_Base) {
 					throw new EE_Error(
 						sprintf(
-							__( 'Index "%1$s" in the model %2$s\'s _cap_restriction_generators is not a child of EE_Restriction_Generator_Base. It should be that or NULL.', 'event_espresso' ),
+							__('Index "%1$s" in the model %2$s\'s _cap_restriction_generators is not a child of EE_Restriction_Generator_Base. It should be that or NULL.', 'event_espresso'),
 							$context,
 							$this->get_this_model_name()
 						)
 					);
 				}
-				$action = $this->cap_action_for_context( $context );
-				if( ! $generator_object->construction_finalized() ){
-					$generator_object->_construct_finalize( $this, $action );
+				$action = $this->cap_action_for_context($context);
+				if ( ! $generator_object->construction_finalized()) {
+					$generator_object->_construct_finalize($this, $action);
 				}
 
 			}
@@ -500,11 +500,11 @@ 
 	 * @param string $context one of EEM_Base::valid_cap_contexts()
 	 * @return EE_Default_Where_Conditions[]
 	 */
-	protected function _generate_cap_restrictions( $context ){
-		if( isset( $this->_cap_restriction_generators[ $context ] ) &&
-				$this->_cap_restriction_generators[ $context ] instanceof EE_Restriction_Generator_Base ) {
-			return $this->_cap_restriction_generators[ $context ]->generate_restrictions();
-		}else{
+	protected function _generate_cap_restrictions($context) {
+		if (isset($this->_cap_restriction_generators[$context]) &&
+				$this->_cap_restriction_generators[$context] instanceof EE_Restriction_Generator_Base) {
+			return $this->_cap_restriction_generators[$context]->generate_restrictions();
+		} else {
 			return array();
 		}
 }
@@ -516,20 +516,20 @@ 
 	 * This sets the _timezone property after model object has been instantiated.
 	 * @param string $timezone valid PHP DateTimeZone timezone string
 	 */
-	public function set_timezone( $timezone ) {
-		if($timezone !== NULL){
+	public function set_timezone($timezone) {
+		if ($timezone !== NULL) {
 			$this->_timezone = $timezone;
 		}
 
 		//note we need to loop through relations and set the timezone on those objects as well.
-		foreach ( $this->_model_relations as $relation ) {
+		foreach ($this->_model_relations as $relation) {
 			$relation->set_timezone($timezone);
 		}
 
 		//and finally we do the same for any datetime fields
-		foreach ( $this->_fields as $field ) {
-			if ( $field instanceof EE_Datetime_Field ) {
-				$field->set_timezone( $timezone );
+		foreach ($this->_fields as $field) {
+			if ($field instanceof EE_Datetime_Field) {
+				$field->set_timezone($timezone);
 			}
 		}
 	}
@@ -541,16 +541,16 @@ 
 	 *		@param string $timezone string representing the timezone we want to set for returned Date Time Strings (and any incoming timezone data that gets saved).  Note this just sends the timezone info to the date time model field objects.  Default is NULL (and will be assumed using the set timezone in the 'timezone_string' wp option)
 	 *		@return static (as in the concrete child class)
 	 */
-	public static function instance( $timezone = NULL ){
+	public static function instance($timezone = NULL) {
 
 		// check if instance of Espresso_model already exists
 		if ( ! static::$_instance instanceof static) {
 			// instantiate Espresso_model
-			static::$_instance = new static( $timezone );
+			static::$_instance = new static($timezone);
 		}
 
 		//we might have a timezone set, let set_timezone decide what to do with it
-		static::$_instance->set_timezone( $timezone );
+		static::$_instance->set_timezone($timezone);
 
 		// Espresso_model object
 		return static::$_instance;
@@ -562,9 +562,9 @@ 
 	 * resets the model and returns it
 	 * @return static
 	 */
-	public static function reset(  $timezone = NULL ){
+	public static function reset($timezone = NULL) {
 		static::$_instance = NULL;
-		return self::instance( $timezone );
+		return self::instance($timezone);
 	}
 
 	/**
@@ -573,15 +573,15 @@ 
 	 * @param  boolean $translated return localized strings or JUST the array.
 	 * @return array
 	 */
-	 public function status_array( $translated = FALSE ) {
-	 	if ( !array_key_exists('Status', $this->_model_relations ) )
+	 public function status_array($translated = FALSE) {
+	 	if ( ! array_key_exists('Status', $this->_model_relations))
 	 		return array();
 	 	$model_name = $this->get_this_model_name();
-	 	$status_type = str_replace(' ', '_', strtolower( str_replace('_', ' ', $model_name) ) );
-	 	$stati = EEM_Status::instance()->get_all(array(array('STS_type' => $status_type) ) );
+	 	$status_type = str_replace(' ', '_', strtolower(str_replace('_', ' ', $model_name)));
+	 	$stati = EEM_Status::instance()->get_all(array(array('STS_type' => $status_type)));
 	 	$status_array = array();
-	 	foreach ( $stati as $status ) {
-            $status_array[ $status->ID() ] = $status->get('STS_code');
+	 	foreach ($stati as $status) {
+            $status_array[$status->ID()] = $status->get('STS_code');
         }
         return $translated ? EEM_Status::instance()->localized_status($status_array, FALSE, 'sentence') : $status_array;
     }
@@ -722,7 +722,7 @@ 
 	 *			'order_by'=>array('ANS_value'=>'ASC')
 	 *		));
 	 */
-	function get_all($query_params = array()){
+	function get_all($query_params = array()) {
 		return $this->_create_objects($this->_get_all_wpdb_results($query_params, ARRAY_A, NULL));
 	}
 
@@ -732,10 +732,10 @@ 
 	 * @param array $query_parms @see EEM_Base::get_all()
 	 * @return array like EEM_Base::get_all
 	 */
-	function alter_query_params_to_only_include_mine( $query_parms = array() ) {
+	function alter_query_params_to_only_include_mine($query_parms = array()) {
 		$wp_user_field_name = $this->wp_user_field_name();
-		if( $wp_user_field_name ){
-			$query_parms[0][ $wp_user_field_name ] = get_current_user_id();
+		if ($wp_user_field_name) {
+			$query_parms[0][$wp_user_field_name] = get_current_user_id();
 		}
 		return $query_parms;
 	}
@@ -748,19 +748,19 @@ 
 	 * foreign key to the WP_User table
 	 */
 	function wp_user_field_name() {
-		try{
-			if( ! empty( $this->_model_chain_to_wp_user ) ) {
-				$models_to_follow_to_wp_users = explode( '.', $this->_model_chain_to_wp_user );
-				$last_model_name = end( $models_to_follow_to_wp_users );
-				$model_with_fk_to_wp_users = EE_Registry::instance()->load_model( $last_model_name );
-				$model_chain_to_wp_user = $this->_model_chain_to_wp_user . '.';
-			}else{
+		try {
+			if ( ! empty($this->_model_chain_to_wp_user)) {
+				$models_to_follow_to_wp_users = explode('.', $this->_model_chain_to_wp_user);
+				$last_model_name = end($models_to_follow_to_wp_users);
+				$model_with_fk_to_wp_users = EE_Registry::instance()->load_model($last_model_name);
+				$model_chain_to_wp_user = $this->_model_chain_to_wp_user.'.';
+			} else {
 				$model_with_fk_to_wp_users = $this;
 				$model_chain_to_wp_user = '';
 			}
-			$wp_user_field = $model_with_fk_to_wp_users->get_foreign_key_to( 'WP_User' );
-			return $model_chain_to_wp_user . $wp_user_field->get_name();
-		}catch( EE_Error $e ) {
+			$wp_user_field = $model_with_fk_to_wp_users->get_foreign_key_to('WP_User');
+			return $model_chain_to_wp_user.$wp_user_field->get_name();
+		} catch (EE_Error $e) {
 			return false;
 		}
 	}
@@ -774,7 +774,7 @@ 
 	 * (or transietly-related model)
 	 * @return string
 	 */
-	public function model_chain_to_wp_user(){
+	public function model_chain_to_wp_user() {
 		return $this->_model_chain_to_wp_user;
 	}
 
@@ -786,13 +786,13 @@ 
 	 * @return boolean
 	 */
 	public function is_owned() {
-		if( $this->model_chain_to_wp_user() ){
+		if ($this->model_chain_to_wp_user()) {
 			return true;
-		}else{
-			try{
-				$this->get_foreign_key_to( 'WP_User' );
+		} else {
+			try {
+				$this->get_foreign_key_to('WP_User');
 				return true;
-			}catch( EE_Error $e ){
+			} catch (EE_Error $e) {
 				return false;
 			}
 		}
@@ -811,21 +811,21 @@ 
 	 * and 1 is the data type. Eg, array('count'=>array('COUNT(REG_ID)','%d'))
 	 * @return stdClass[] like results of $wpdb->get_results($sql,OBJECT), (ie, output type is OBJECT)
 	 */
-	protected function  _get_all_wpdb_results($query_params = array(), $output = ARRAY_A, $columns_to_select = null){
+	protected function  _get_all_wpdb_results($query_params = array(), $output = ARRAY_A, $columns_to_select = null) {
 		//remember the custom selections, if any
-		if(is_array($columns_to_select)){
+		if (is_array($columns_to_select)) {
 			$this->_custom_selections = $columns_to_select;
-		}elseif(is_string($columns_to_select)){
+		}elseif (is_string($columns_to_select)) {
 			$this->_custom_selections = array($this->_custom_selections);
-		}else{
+		} else {
 			$this->_custom_selections = array();
 		}
 
 		$model_query_info = $this->_create_model_query_info_carrier($query_params);
 		$select_expressions = $columns_to_select ? $this->_construct_select_from_input($columns_to_select) : $this->_construct_default_select_sql($model_query_info);
-		$SQL ="SELECT $select_expressions ".$this->_construct_2nd_half_of_select_query($model_query_info);
+		$SQL = "SELECT $select_expressions ".$this->_construct_2nd_half_of_select_query($model_query_info);
 //		echo "sql:$SQL";
-		$results =  $this->_do_wpdb_query( 'get_results', array($SQL, $output ) );// $wpdb->get_results($SQL, $output);
+		$results = $this->_do_wpdb_query('get_results', array($SQL, $output)); // $wpdb->get_results($SQL, $output);
 		return $results;
 	}
 
@@ -842,7 +842,7 @@ 
 	 * and 1 is the data type. Eg, array('count'=>array('COUNT(REG_ID)','%d'))
 	 * @return stdClass[] like results of $wpdb->get_results($sql,OBJECT), (ie, output type is OBJECT)
 	 */
-	public function  get_all_wpdb_results($query_params = array(), $output = ARRAY_A, $columns_to_select = null){
+	public function  get_all_wpdb_results($query_params = array(), $output = ARRAY_A, $columns_to_select = null) {
 		return $this->_get_all_wpdb_results($query_params, $output, $columns_to_select);
 	}
 
@@ -854,21 +854,21 @@ 
 	 * @throws EE_Error
 	 * @return string
 	 */
-	private function _construct_select_from_input($columns_to_select){
-		if(is_array($columns_to_select)){
+	private function _construct_select_from_input($columns_to_select) {
+		if (is_array($columns_to_select)) {
 			$select_sql_array = array();
 
-			foreach($columns_to_select as $alias => $selection_and_datatype){
-				if( ! is_array($selection_and_datatype) || ! isset($selection_and_datatype[1])){
-					throw new EE_Error(sprintf(__("Custom selection %s (alias %s) needs to be an array like array('COUNT(REG_ID)','%%d')", "event_espresso"),$selection_and_datatype,$alias));
+			foreach ($columns_to_select as $alias => $selection_and_datatype) {
+				if ( ! is_array($selection_and_datatype) || ! isset($selection_and_datatype[1])) {
+					throw new EE_Error(sprintf(__("Custom selection %s (alias %s) needs to be an array like array('COUNT(REG_ID)','%%d')", "event_espresso"), $selection_and_datatype, $alias));
 				}
-				if( ! in_array( $selection_and_datatype[1],$this->_valid_wpdb_data_types)){
-					throw new EE_Error(sprintf(__("Datatype %s (for selection '%s' and alias '%s') is not a valid wpdb datatype (eg %%s)", "event_espresso"),$selection_and_datatype[1],$selection_and_datatype[0],$alias,implode(",",$this->_valid_wpdb_data_types)));
+				if ( ! in_array($selection_and_datatype[1], $this->_valid_wpdb_data_types)) {
+					throw new EE_Error(sprintf(__("Datatype %s (for selection '%s' and alias '%s') is not a valid wpdb datatype (eg %%s)", "event_espresso"), $selection_and_datatype[1], $selection_and_datatype[0], $alias, implode(",", $this->_valid_wpdb_data_types)));
 				}
 				$select_sql_array[] = "{$selection_and_datatype[0]} AS $alias";
 			}
-			$columns_to_select_string = implode(", ",$select_sql_array);
-		}else{
+			$columns_to_select_string = implode(", ", $select_sql_array);
+		} else {
 			$columns_to_select_string = $columns_to_select;
 		}
 		return $columns_to_select_string;
@@ -881,7 +881,7 @@ 
 	 * Convenient wrapper for getting the primary key field's name. Eg, on Registration, this would be 'REG_ID'
 	 * @return string
 	 */
-	function primary_key_name(){
+	function primary_key_name() {
 		return $this->get_primary_key_field()->get_name();
 	}
 
@@ -893,15 +893,15 @@ 
 	 * @param mixed $id int or string, depending on the type of the model's primary key
 	 * @return EE_Base_Class
 	 */
-	function get_one_by_ID($id){
-		if( $this->get_from_entity_map( $id ) ){
-			return $this->get_from_entity_map( $id );
-		}elseif( $this->has_primary_key_field ( ) ) {
+	function get_one_by_ID($id) {
+		if ($this->get_from_entity_map($id)) {
+			return $this->get_from_entity_map($id);
+		}elseif ($this->has_primary_key_field( )) {
 			$primary_key_name = $this->get_primary_key_field()->get_name();
 			return $this->get_one(array(array($primary_key_name => $id)));
-		}else{
+		} else {
 			//no primary key, so the $id must be from the get_index_primary_key_string()
-			return $this->get_one( array( $this->parse_index_primary_key_string( $id ) ) );
+			return $this->get_one(array($this->parse_index_primary_key_string($id)));
 		}
 	}
 
@@ -912,16 +912,16 @@ 
 	 * @param array $query_params like EEM_Base's $query_params variable.
 	 * @return EE_Base_Class | NULL
 	 */
-	function get_one($query_params = array()){
-		if( ! is_array( $query_params ) ){
-			EE_Error::doing_it_wrong('EEM_Base::get_one', sprintf( __( '$query_params should be an array, you passed a variable of type %s', 'event_espresso' ), gettype( $query_params ) ), '4.6.0' );
+	function get_one($query_params = array()) {
+		if ( ! is_array($query_params)) {
+			EE_Error::doing_it_wrong('EEM_Base::get_one', sprintf(__('$query_params should be an array, you passed a variable of type %s', 'event_espresso'), gettype($query_params)), '4.6.0');
 			$query_params = array();
 		}
 		$query_params['limit'] = 1;
 		$items = $this->get_all($query_params);
-		if(empty($items)){
+		if (empty($items)) {
 			return null;
-		}else{
+		} else {
 			return array_shift($items);
 		}
 	}
@@ -945,8 +945,8 @@ 
 	 *
 	 * @return EE_Base_Class[]|array
 	 */
-	public function next_x( $current_field_value, $field_to_order_by = null, $limit = 1, $query_params = array(), $columns_to_select = null ) {
-		return $this->_get_consecutive( $current_field_value, '>', $field_to_order_by, $limit, $query_params, $columns_to_select );
+	public function next_x($current_field_value, $field_to_order_by = null, $limit = 1, $query_params = array(), $columns_to_select = null) {
+		return $this->_get_consecutive($current_field_value, '>', $field_to_order_by, $limit, $query_params, $columns_to_select);
 	}
 
 
@@ -969,8 +969,8 @@ 
 	 *
 	 * @return EE_Base_Class[]|array
 	 */
-	public function previous_x( $current_field_value, $field_to_order_by = null, $limit = 1, $query_params = array(), $columns_to_select = null ) {
-		return $this->_get_consecutive( $current_field_value, '<', $field_to_order_by, $limit, $query_params, $columns_to_select );
+	public function previous_x($current_field_value, $field_to_order_by = null, $limit = 1, $query_params = array(), $columns_to_select = null) {
+		return $this->_get_consecutive($current_field_value, '<', $field_to_order_by, $limit, $query_params, $columns_to_select);
 	}
 
 
@@ -992,9 +992,9 @@ 
 	 *
 	 * @return EE_Base_Class|null|array()
 	 */
-	public function next( $current_field_value, $field_to_order_by = null, $query_params = array(), $columns_to_select = null ) {
-		$results = $this->_get_consecutive( $current_field_value, '>', $field_to_order_by, 1, $query_params, $columns_to_select );
-		return empty( $results ) ? null : reset( $results );
+	public function next($current_field_value, $field_to_order_by = null, $query_params = array(), $columns_to_select = null) {
+		$results = $this->_get_consecutive($current_field_value, '>', $field_to_order_by, 1, $query_params, $columns_to_select);
+		return empty($results) ? null : reset($results);
 	}
 
 
@@ -1016,9 +1016,9 @@ 
 	 *
 	 * @return EE_Base_Class|null|array()
 	 */
-	public function previous( $current_field_value, $field_to_order_by = null, $query_params = array(), $columns_to_select = null ) {
-		$results = $this->_get_consecutive( $current_field_value, '<', $field_to_order_by, 1, $query_params, $columns_to_select );
-		return empty( $results ) ? null : reset( $results );
+	public function previous($current_field_value, $field_to_order_by = null, $query_params = array(), $columns_to_select = null) {
+		$results = $this->_get_consecutive($current_field_value, '<', $field_to_order_by, 1, $query_params, $columns_to_select);
+		return empty($results) ? null : reset($results);
 	}
 
 
@@ -1044,40 +1044,40 @@ 
 	 * @return EE_Base_Class[]|array
 	 * @throws EE_Error
 	 */
-	protected function _get_consecutive( $current_field_value, $operand = '>', $field_to_order_by = null, $limit = 1, $query_params = array(), $columns_to_select = null ) {
+	protected function _get_consecutive($current_field_value, $operand = '>', $field_to_order_by = null, $limit = 1, $query_params = array(), $columns_to_select = null) {
 		//if $field_to_order_by is empty then let's assume we're ordering by the primary key.
-		if ( empty( $field_to_order_by ) ) {
-			if ( $this->has_primary_key_field() ) {
+		if (empty($field_to_order_by)) {
+			if ($this->has_primary_key_field()) {
 				$field_to_order_by = $this->get_primary_key_field()->get_name();
 			} else {
 
-				if ( WP_DEBUG ) {
-					throw new EE_Error( __( 'EEM_Base::_get_consecutive() has been called with no $field_to_order_by argument and there is no primary key on the field.  Please provide the field you would like to use as the base for retrieving the next item(s).', 'event_espresso' ) );
+				if (WP_DEBUG) {
+					throw new EE_Error(__('EEM_Base::_get_consecutive() has been called with no $field_to_order_by argument and there is no primary key on the field.  Please provide the field you would like to use as the base for retrieving the next item(s).', 'event_espresso'));
 				}
-				EE_Error::add_error( __('There was an error with the query.', 'event_espresso') );
+				EE_Error::add_error(__('There was an error with the query.', 'event_espresso'));
 				return array();
 			}
 		}
 
-		if( ! is_array( $query_params ) ){
-			EE_Error::doing_it_wrong('EEM_Base::_get_consecutive', sprintf( __( '$query_params should be an array, you passed a variable of type %s', 'event_espresso' ), gettype( $query_params ) ), '4.6.0' );
+		if ( ! is_array($query_params)) {
+			EE_Error::doing_it_wrong('EEM_Base::_get_consecutive', sprintf(__('$query_params should be an array, you passed a variable of type %s', 'event_espresso'), gettype($query_params)), '4.6.0');
 			$query_params = array();
 		}
 
 		//let's add the where query param for consecutive look up.
-		$query_params[0][ $field_to_order_by ] = array( $operand, $current_field_value );
+		$query_params[0][$field_to_order_by] = array($operand, $current_field_value);
 		$query_params['limit'] = $limit;
 
 		//set direction
-		$incoming_orderby = isset( $query_params['order_by'] ) ? $query_params['order_by'] : array();
-		$query_params['order_by'] = $operand == '>' ? array( $field_to_order_by => 'ASC' ) + $incoming_orderby : array( $field_to_order_by => 'DESC') + $incoming_orderby;
+		$incoming_orderby = isset($query_params['order_by']) ? $query_params['order_by'] : array();
+		$query_params['order_by'] = $operand == '>' ? array($field_to_order_by => 'ASC') + $incoming_orderby : array($field_to_order_by => 'DESC') + $incoming_orderby;
 
 		//if $columns_to_select is empty then that means we're returning EE_Base_Class objects
-		if ( empty( $columns_to_select ) ) {
-			return $this->get_all( $query_params );
+		if (empty($columns_to_select)) {
+			return $this->get_all($query_params);
 		} else {
 			//getting just the fields
-			return $this->_get_all_wpdb_results( $query_params, ARRAY_A, $columns_to_select );
+			return $this->_get_all_wpdb_results($query_params, ARRAY_A, $columns_to_select);
 		}
 	}
 
@@ -1100,7 +1100,7 @@ 
 	 * Gets all the tables comprising this model. Array keys are the table aliases, and values are EE_Table objects
 	 * @return EE_Table_Base[]
 	 */
-	function get_tables(){
+	function get_tables() {
 		return $this->_tables;
 	}
 
@@ -1134,9 +1134,9 @@ 
 	 * be aware that model objects being used could get out-of-sync with the database
 	 * @return int how many rows got updated or FALSE if something went wrong with the query (wp returns FALSE or num rows affected which *could* include 0 which DOES NOT mean the query was bad)
 	 */
-	function update($fields_n_values, $query_params, $keep_model_objs_in_sync = TRUE){
-		if( ! is_array( $query_params ) ){
-			EE_Error::doing_it_wrong('EEM_Base::update', sprintf( __( '$query_params should be an array, you passed a variable of type %s', 'event_espresso' ), gettype( $query_params ) ), '4.6.0' );
+	function update($fields_n_values, $query_params, $keep_model_objs_in_sync = TRUE) {
+		if ( ! is_array($query_params)) {
+			EE_Error::doing_it_wrong('EEM_Base::update', sprintf(__('$query_params should be an array, you passed a variable of type %s', 'event_espresso'), gettype($query_params)), '4.6.0');
 			$query_params = array();
 		}
 		/**
@@ -1146,7 +1146,7 @@ 
 		 * @param array $fields_n_values the updated fields and their new values
 		 * @param array $query_params @see EEM_Base::get_all()
 		 */
-		do_action( 'AHEE__EEM_Base__update__begin',$this, $fields_n_values, $query_params );
+		do_action('AHEE__EEM_Base__update__begin', $this, $fields_n_values, $query_params);
 		/**
 		 * Filters the fields about to be updated given the query parameters. You can provide the
 		 * $query_params to $this->get_all() to find exactly which records will be updated
@@ -1154,10 +1154,10 @@ 
 		 * @param EEM_Base $model the model being queried
 		 * @param array $query_params see EEM_Base::get_all()
 		 */
-		$fields_n_values = apply_filters( 'FHEE__EEM_Base__update__fields_n_values', $fields_n_values, $this, $query_params );
+		$fields_n_values = apply_filters('FHEE__EEM_Base__update__fields_n_values', $fields_n_values, $this, $query_params);
 		//need to verify that, for any entry we want to update, there are entries in each secondary table.
 		//to do that, for each table, verify that it's PK isn't null.
-		$tables= $this->get_tables();
+		$tables = $this->get_tables();
 
 		//and if the other tables don't have a row for each table-to-be-updated, we'll insert one with whatever values available in the current update query
 		//NOTE: we should make this code more efficient by NOT querying twice
@@ -1167,29 +1167,29 @@ 
 			//we want to make sure the default_where strategy is ignored
 			$this->_ignore_where_strategy = TRUE;
 			$wpdb_select_results = $this->_get_all_wpdb_results($query_params);
-			foreach( $wpdb_select_results as $wpdb_result ){
+			foreach ($wpdb_select_results as $wpdb_result) {
 				// type cast stdClass as array
-				$wpdb_result = (array)$wpdb_result;
+				$wpdb_result = (array) $wpdb_result;
 				//get the model object's PK, as we'll want this if we need to insert a row into secondary tables
-				if( $this->has_primary_key_field() ){
-					$main_table_pk_value = $wpdb_result[ $this->get_primary_key_field()->get_qualified_column() ];
-				}else{
+				if ($this->has_primary_key_field()) {
+					$main_table_pk_value = $wpdb_result[$this->get_primary_key_field()->get_qualified_column()];
+				} else {
 					//if there's no primary key, we basically can't support having a 2nd table on the model (we could but it woudl be lots of work)
 					$main_table_pk_value = null;
 				}
 				//if there are more than 1 tables, we'll want to verify that each table for this model has an entry in the other tables
 				//and if the other tables don't have a row for each table-to-be-updated, we'll insert one with whatever values available in the current update query
-				if(count($tables) > 1){
+				if (count($tables) > 1) {
 					//foreach matching row in the DB, ensure that each table's PK isn't null. If so, there must not be an entry
 					//in that table, and so we'll want to insert one
-					foreach($tables as $table_obj){
+					foreach ($tables as $table_obj) {
 						$this_table_pk_column = $table_obj->get_fully_qualified_pk_column();
 						//if there is no private key for this table on the results, it means there's no entry
 						//in this table, right? so insert a row in the current table, using any fields available
-						if( ! ( array_key_exists( $this_table_pk_column, $wpdb_result) && $wpdb_result[ $this_table_pk_column ] )){
+						if ( ! (array_key_exists($this_table_pk_column, $wpdb_result) && $wpdb_result[$this_table_pk_column])) {
 							$success = $this->_insert_into_specific_table($table_obj, $fields_n_values, $main_table_pk_value);
 							//if we died here, report the error
-							if( ! $success ) {
+							if ( ! $success) {
 								return false;
 							}
 						}
@@ -1209,44 +1209,44 @@ 
 		//if this wasn't called from a model object (to update itself)
 		//then we want to make sure we keep all the existing
 		//model objects in sync with the db
-		if( $keep_model_objs_in_sync && ! $this->_values_already_prepared_by_model_object ){
-			if( $this->has_primary_key_field() ){
-				$model_objs_affected_ids = $this->get_col( $query_params );
-			}else{
+		if ($keep_model_objs_in_sync && ! $this->_values_already_prepared_by_model_object) {
+			if ($this->has_primary_key_field()) {
+				$model_objs_affected_ids = $this->get_col($query_params);
+			} else {
 				//we need to select a bunch of columns and then combine them into the the "index primary key string"s
-				$models_affected_key_columns = $this->_get_all_wpdb_results($query_params, ARRAY_A );
+				$models_affected_key_columns = $this->_get_all_wpdb_results($query_params, ARRAY_A);
 				$model_objs_affected_ids = array();
-				foreach( $models_affected_key_columns as $row ){
-					$combined_index_key = $this->get_index_primary_key_string( $row );
-					$model_objs_affected_ids[ $combined_index_key ] = $combined_index_key;
+				foreach ($models_affected_key_columns as $row) {
+					$combined_index_key = $this->get_index_primary_key_string($row);
+					$model_objs_affected_ids[$combined_index_key] = $combined_index_key;
 				}
 
 			}
 
-			if( ! $model_objs_affected_ids ){
+			if ( ! $model_objs_affected_ids) {
 				//wait wait wait- if nothing was affected let's stop here
 				return 0;
 			}
-			foreach( $model_objs_affected_ids as $id ){
-				$model_obj_in_entity_map = $this->get_from_entity_map( $id );
-				if( $model_obj_in_entity_map ){
-					foreach( $fields_n_values as $field => $new_value ){
-						$model_obj_in_entity_map->set( $field, $new_value );
+			foreach ($model_objs_affected_ids as $id) {
+				$model_obj_in_entity_map = $this->get_from_entity_map($id);
+				if ($model_obj_in_entity_map) {
+					foreach ($fields_n_values as $field => $new_value) {
+						$model_obj_in_entity_map->set($field, $new_value);
 					}
 				}
 			}
 			//if there is a primary key on this model, we can now do a slight optimization
-			if( $this->has_primary_key_field() ){
+			if ($this->has_primary_key_field()) {
 				//we already know what we want to update. So let's make the query simpler so it's a little more efficient
 				$query_params = array(
-					array( $this->primary_key_name() => array( 'IN', $model_objs_affected_ids ) ),
-					'limit' => count( $model_objs_affected_ids ), 'default_where_conditions' => 'none' );
+					array($this->primary_key_name() => array('IN', $model_objs_affected_ids)),
+					'limit' => count($model_objs_affected_ids), 'default_where_conditions' => 'none' );
 			}
 		}
 
-		$model_query_info = $this->_create_model_query_info_carrier( $query_params );
-		$SQL = "UPDATE ".$model_query_info->get_full_join_sql()." SET ".$this->_construct_update_sql($fields_n_values).$model_query_info->get_where_sql();//note: doesn't use _construct_2nd_half_of_select_query() because doesn't accept LIMIT, ORDER BY, etc.
-		$rows_affected = $this->_do_wpdb_query('query', array( $SQL ) );
+		$model_query_info = $this->_create_model_query_info_carrier($query_params);
+		$SQL = "UPDATE ".$model_query_info->get_full_join_sql()." SET ".$this->_construct_update_sql($fields_n_values).$model_query_info->get_where_sql(); //note: doesn't use _construct_2nd_half_of_select_query() because doesn't accept LIMIT, ORDER BY, etc.
+		$rows_affected = $this->_do_wpdb_query('query', array($SQL));
 		/**
 		 * Action called after a model update call has been made.
 		 *
@@ -1255,8 +1255,8 @@ 
 		 * @param array $query_params @see EEM_Base::get_all()
 		 * @param int $rows_affected
 		 */
-		do_action( 'AHEE__EEM_Base__update__end',$this, $fields_n_values, $query_params, $rows_affected );
-		return $rows_affected;//how many supposedly got updated
+		do_action('AHEE__EEM_Base__update__end', $this, $fields_n_values, $query_params, $rows_affected);
+		return $rows_affected; //how many supposedly got updated
 	}
 
 	/**
@@ -1268,22 +1268,22 @@ 
 	 * @param string $field_to_select
 	 * @return array just like $wpdb->get_col()
 	 */
-	public function get_col( $query_params  = array(), $field_to_select = NULL ){
+	public function get_col($query_params = array(), $field_to_select = NULL) {
 
-		if( $field_to_select ){
-			$field = $this->field_settings_for( $field_to_select );
-		}elseif( $this->has_primary_key_field ( ) ){
+		if ($field_to_select) {
+			$field = $this->field_settings_for($field_to_select);
+		}elseif ($this->has_primary_key_field( )) {
 			$field = $this->get_primary_key_field();
-		}else{
+		} else {
 			//no primary key, just grab the first column
-			$field = reset( $this->field_settings());
+			$field = reset($this->field_settings());
 		}
 
 
 		$model_query_info = $this->_create_model_query_info_carrier($query_params);
 		$select_expressions = $field->get_qualified_column();
-		$SQL ="SELECT $select_expressions ".$this->_construct_2nd_half_of_select_query($model_query_info);
-		$results =  $this->_do_wpdb_query('get_col', array( $SQL ) );
+		$SQL = "SELECT $select_expressions ".$this->_construct_2nd_half_of_select_query($model_query_info);
+		$results = $this->_do_wpdb_query('get_col', array($SQL));
 		return $results;
 	}
 
@@ -1293,12 +1293,12 @@ 
 	 * @param string $field_to_select @see EEM_Base::get_col()
 	 * @return string
 	 */
-	public function get_var( $query_params = array(), $field_to_select = NULL ) {
-		$query_params[ 'limit' ] = 1;
-		$col = $this->get_col( $query_params, $field_to_select );
-		if( ! empty( $col ) ) {
-			return reset( $col );
-		}else{
+	public function get_var($query_params = array(), $field_to_select = NULL) {
+		$query_params['limit'] = 1;
+		$col = $this->get_col($query_params, $field_to_select);
+		if ( ! empty($col)) {
+			return reset($col);
+		} else {
 			return NULL;
 		}
 	}
@@ -1312,18 +1312,18 @@ 
 	 * @param array $fields_n_values array keys are field names on this model, and values are what those fields should be updated to in the DB
 	 * @return string of SQL
 	 */
-	function _construct_update_sql($fields_n_values){
+	function _construct_update_sql($fields_n_values) {
 		global $wpdb;
 		$cols_n_values = array();
-		foreach($fields_n_values as $field_name => $value){
+		foreach ($fields_n_values as $field_name => $value) {
 			$field_obj = $this->field_settings_for($field_name);
 			//if the value is NULL, we want to assign the value to that.
 			//wpdb->prepare doesn't really handle that properly
-			$prepared_value = $this->_prepare_value_or_use_default( $field_obj, $fields_n_values );
-			$value_sql = $prepared_value===NULL ? 'NULL' : $wpdb->prepare( $field_obj->get_wpdb_data_type(), $prepared_value );
+			$prepared_value = $this->_prepare_value_or_use_default($field_obj, $fields_n_values);
+			$value_sql = $prepared_value === NULL ? 'NULL' : $wpdb->prepare($field_obj->get_wpdb_data_type(), $prepared_value);
 			$cols_n_values[] = $field_obj->get_qualified_column()."=".$value_sql;
 		}
-		return implode(",",$cols_n_values);
+		return implode(",", $cols_n_values);
 
 	}
 
@@ -1335,11 +1335,11 @@ 
 	 * @param mixed $id
 	 * @return boolean whether the row got deleted or not
 	 */
-	public function delete_by_ID( $id ){
-		return $this->delete( array(
-			array( $this->get_primary_key_field()->get_name() => $id ),
+	public function delete_by_ID($id) {
+		return $this->delete(array(
+			array($this->get_primary_key_field()->get_name() => $id),
 			'limit' 	=> 1
-		) );
+		));
 	}
 
 
@@ -1354,7 +1354,7 @@ 
 	 * which may depend on it. Its generally advisable to always leave this as TRUE, otherwise you could easily corrupt your DB
 	 * @return int how many rows got deleted
 	 */
-	function delete($query_params,$allow_blocking = true){
+	function delete($query_params, $allow_blocking = true) {
 		/**
 		 * Action called just before performing a real deletion query. You can use the
 		 * model and its $query_params to find exactly which items will be deleted
@@ -1363,34 +1363,34 @@ 
 		 * @param boolean $allow_blocking whether or not to allow related model objects
 		 * to block (prevent) this deletion
 		 */
-		do_action( 'AHEE__EEM_Base__delete__begin', $this, $query_params, $allow_blocking );
+		do_action('AHEE__EEM_Base__delete__begin', $this, $query_params, $allow_blocking);
 		//some MySQL databases may be running safe mode, which may restrict
 		//deletion if there is no KEY column used in the WHERE statement of a deletion.
 		//to get around this, we first do a SELECT, get all the IDs, and then run another query
 		//to delete them
 		$items_for_deletion = $this->_get_all_wpdb_results($query_params);
-		$deletion_where = $this->_setup_ids_for_delete( $items_for_deletion, $allow_blocking);
-		if($deletion_where){
+		$deletion_where = $this->_setup_ids_for_delete($items_for_deletion, $allow_blocking);
+		if ($deletion_where) {
 			//echo "objects for deletion:";var_dump($objects_for_deletion);
 			$model_query_info = $this->_create_model_query_info_carrier($query_params);
 			$table_aliases = array();
-			foreach(array_keys($this->_tables) as $table_alias){
+			foreach (array_keys($this->_tables) as $table_alias) {
 				$table_aliases[] = $table_alias;
 			}
-			$SQL = "DELETE ".implode(", ",$table_aliases)." FROM ".$model_query_info->get_full_join_sql()." WHERE ".$deletion_where;
+			$SQL = "DELETE ".implode(", ", $table_aliases)." FROM ".$model_query_info->get_full_join_sql()." WHERE ".$deletion_where;
 
 			//		/echo "delete sql:$SQL";
-			$rows_deleted = $this->_do_wpdb_query( 'query', array( $SQL ) );
-		}else{
+			$rows_deleted = $this->_do_wpdb_query('query', array($SQL));
+		} else {
 			$rows_deleted = 0;
 		}
 
 		//and lastly make sure those items are removed from the entity map; if they could be put into it at all
-		if( $this->has_primary_key_field() ){
-			foreach($items_for_deletion as $item_for_deletion_row ){
-				$pk_value = $item_for_deletion_row[ $this->get_primary_key_field()->get_qualified_column() ];
-				if( isset( $this->_entity_map[ $pk_value ] ) ){
-					unset( $this->_entity_map[ $pk_value ] );
+		if ($this->has_primary_key_field()) {
+			foreach ($items_for_deletion as $item_for_deletion_row) {
+				$pk_value = $item_for_deletion_row[$this->get_primary_key_field()->get_qualified_column()];
+				if (isset($this->_entity_map[$pk_value])) {
+					unset($this->_entity_map[$pk_value]);
 				}
 			}
 		}
@@ -1402,8 +1402,8 @@ 
 		 * @param array $query_params @see EEM_Base::get_all()
 		 * @param int $rows_deleted
 		 */
-		do_action( 'AHEE__EEM_Base__delete__end', $this, $query_params, $rows_deleted );
-		return $rows_deleted;//how many supposedly got deleted
+		do_action('AHEE__EEM_Base__delete__end', $this, $query_params, $rows_deleted);
+		return $rows_deleted; //how many supposedly got deleted
 	}
 
 
@@ -1419,28 +1419,28 @@ 
 	 * blocking its deletion before removing the relation between A and B
 	 * @return boolean
 	 */
-	public function delete_is_blocked_by_related_models($this_model_obj_or_id, $ignore_this_model_obj = null){
+	public function delete_is_blocked_by_related_models($this_model_obj_or_id, $ignore_this_model_obj = null) {
 		//first, if $ignore_this_model_obj was supplied, get its model
-		if($ignore_this_model_obj && $ignore_this_model_obj instanceof EE_Base_Class){
+		if ($ignore_this_model_obj && $ignore_this_model_obj instanceof EE_Base_Class) {
 			$ignored_model = $ignore_this_model_obj->get_model();
-		}else{
+		} else {
 			$ignored_model = null;
 		}
 		//now check all the relations of $this_model_obj_or_id and see if there
 		//are any related model objects blocking it?
 		$is_blocked = false;
-		foreach($this->_model_relations as $relation_name => $relation_obj){
-			if( $relation_obj->block_delete_if_related_models_exist()){
+		foreach ($this->_model_relations as $relation_name => $relation_obj) {
+			if ($relation_obj->block_delete_if_related_models_exist()) {
 				//if $ignore_this_model_obj was supplied, then for the query
 				//on that model needs to be told to ignore $ignore_this_model_obj
-				if($ignored_model && $relation_name == $ignored_model->get_this_model_name()){
-					$related_model_objects = $relation_obj->get_all_related($this_model_obj_or_id,array(
-					array($ignored_model->get_primary_key_field()->get_name() => array('!=',$ignore_this_model_obj->ID()))));
-				}else{
+				if ($ignored_model && $relation_name == $ignored_model->get_this_model_name()) {
+					$related_model_objects = $relation_obj->get_all_related($this_model_obj_or_id, array(
+					array($ignored_model->get_primary_key_field()->get_name() => array('!=', $ignore_this_model_obj->ID()))));
+				} else {
 					$related_model_objects = $relation_obj->get_all_related($this_model_obj_or_id);
 				}
 
-				if($related_model_objects){
+				if ($related_model_objects) {
 					EE_Error::add_error($relation_obj->get_deletion_error_message(), __FILE__, __FUNCTION__, __LINE__);
 					$is_blocked = true;
 				}
@@ -1460,65 +1460,65 @@ 
 	 * @throws EE_Error
 	 * @return string    everything that comes after the WHERE statement.
 	 */
-	protected function _setup_ids_for_delete( $objects_for_deletion, $allow_blocking = true) {
-		if($this->has_primary_key_field()){
+	protected function _setup_ids_for_delete($objects_for_deletion, $allow_blocking = true) {
+		if ($this->has_primary_key_field()) {
 			$primary_table = $this->_get_main_table();
 			$other_tables = $this->_get_other_tables();
 			$deletes = $query = array();
-			foreach ( $objects_for_deletion as $delete_object ) {
+			foreach ($objects_for_deletion as $delete_object) {
 				//before we mark this object for deletion,
 				//make sure there's no related objects blocking its deletion (if we're checking)
-				if( $allow_blocking && $this->delete_is_blocked_by_related_models($delete_object[$primary_table->get_fully_qualified_pk_column()]) ){
+				if ($allow_blocking && $this->delete_is_blocked_by_related_models($delete_object[$primary_table->get_fully_qualified_pk_column()])) {
 					continue;
 				}
 
 				//primary table deletes
-				if ( isset( $delete_object[$primary_table->get_fully_qualified_pk_column()] ) )
+				if (isset($delete_object[$primary_table->get_fully_qualified_pk_column()]))
 					$deletes[$primary_table->get_fully_qualified_pk_column()][] = $delete_object[$primary_table->get_fully_qualified_pk_column()];
 
 				//other tables
-				if ( !empty( $other_tables ) ) {
-					foreach ( $other_tables as $ot ) {
+				if ( ! empty($other_tables)) {
+					foreach ($other_tables as $ot) {
 
 						//first check if we've got the foreign key column here.
-						if ( isset( $delete_object[$ot->get_fully_qualified_fk_column()] ) )
+						if (isset($delete_object[$ot->get_fully_qualified_fk_column()]))
 							$deletes[$ot->get_fully_qualified_pk_column()][] = $delete_object[$ot->get_fully_qualified_fk_column()];
 
 						//wait! it's entirely possible that we'll have a the primary key for this table in here if it's a foreign key for one of the other secondary tables
-						if ( isset( $delete_object[$ot->get_fully_qualified_pk_column()] ) )
+						if (isset($delete_object[$ot->get_fully_qualified_pk_column()]))
 							$deletes[$ot->get_fully_qualified_pk_column()][] = $delete_object[$ot->get_fully_qualified_pk_column()];
 
 						//finally, it is possible that the fk for this table is found in the fully qualified pk column for the fk table, so let's see if that's there!
-						if ( isset( $delete_object[$ot->get_fully_qualified_pk_on_fk_table()]) )
+						if (isset($delete_object[$ot->get_fully_qualified_pk_on_fk_table()]))
 							$deletes[$ot->get_fully_qualified_pk_column()][] = $delete_object[$ot->get_fully_qualified_pk_column()];
 					}
 				}
 			}
 
 			//we should have deletes now, so let's just go through and setup the where statement
-			foreach ( $deletes as $column => $values ) {
+			foreach ($deletes as $column => $values) {
 				//make sure we have unique $values;
 				$values = array_unique($values);
-				$query[] = $column . ' IN(' . implode(",",$values) . ')';
+				$query[] = $column.' IN('.implode(",", $values).')';
 			}
 
-			return !empty($query) ? implode(' AND ', $query ) : '';
-		}elseif(count($this->get_combined_primary_key_fields()) > 1){
+			return ! empty($query) ? implode(' AND ', $query) : '';
+		}elseif (count($this->get_combined_primary_key_fields()) > 1) {
 			$ways_to_identify_a_row = array();
 			$fields = $this->get_combined_primary_key_fields();
 			//note: because there' sno primary key, that means nothing else  can be pointing to this model, right?
-			foreach($objects_for_deletion as  $delete_object){
+			foreach ($objects_for_deletion as  $delete_object) {
 				$values_for_each_cpk_for_a_row = array();
-				foreach($fields as $cpk_field){
+				foreach ($fields as $cpk_field) {
 					$values_for_each_cpk_for_a_row[] = $cpk_field->get_qualified_column()."=".$delete_object[$cpk_field->get_qualified_column()];
 				}
-				$ways_to_identify_a_row[] = "(".implode(" AND ",$values_for_each_cpk_for_a_row).")";
+				$ways_to_identify_a_row[] = "(".implode(" AND ", $values_for_each_cpk_for_a_row).")";
 			}
-			return implode(" OR ",$ways_to_identify_a_row);
-		}else{
+			return implode(" OR ", $ways_to_identify_a_row);
+		} else {
 			//so there's no primary key and no combined key...
 			//sorry, can't help you
-			throw new EE_Error(sprintf(__("Cannot delete objects of type %s because there is no primary key NOR combined key", "event_espresso"),get_class($this)));
+			throw new EE_Error(sprintf(__("Cannot delete objects of type %s because there is no primary key NOR combined key", "event_espresso"), get_class($this)));
 		}
 	}
 
@@ -1532,21 +1532,21 @@ 
 	 * @param bool 	 $distinct if we want to only count the distinct values for the column then you can trigger that by the setting $distinct to TRUE;
 	 * @return int
 	 */
-	function count($query_params =array(),$field_to_count = NULL, $distinct = FALSE){
+	function count($query_params = array(), $field_to_count = NULL, $distinct = FALSE) {
 		$model_query_info = $this->_create_model_query_info_carrier($query_params);
-		if($field_to_count){
+		if ($field_to_count) {
 			$field_obj = $this->field_settings_for($field_to_count);
 			$column_to_count = $field_obj->get_qualified_column();
-		}elseif($this->has_primary_key_field ()){
+		}elseif ($this->has_primary_key_field()) {
 			$pk_field_obj = $this->get_primary_key_field();
 			$column_to_count = $pk_field_obj->get_qualified_column();
-		}else{//there's no primary key
+		} else {//there's no primary key
 			$column_to_count = '*';
 		}
 
-		$column_to_count = $distinct ? "DISTINCT (" . $column_to_count . " )" : $column_to_count;
-		$SQL ="SELECT COUNT(".$column_to_count.")" . $this->_construct_2nd_half_of_select_query($model_query_info);
-		return (int)$this->_do_wpdb_query( 'get_var', array( $SQL) );
+		$column_to_count = $distinct ? "DISTINCT (".$column_to_count." )" : $column_to_count;
+		$SQL = "SELECT COUNT(".$column_to_count.")".$this->_construct_2nd_half_of_select_query($model_query_info);
+		return (int) $this->_do_wpdb_query('get_var', array($SQL));
 	}
 
 	/**
@@ -1556,23 +1556,23 @@ 
 	 * @param string $field_to_sum name of field (array key in $_fields array)
 	 * @return int
 	 */
-	function sum($query_params, $field_to_sum = NULL){
+	function sum($query_params, $field_to_sum = NULL) {
 		$model_query_info = $this->_create_model_query_info_carrier($query_params);
 
-		if($field_to_sum){
+		if ($field_to_sum) {
 			$field_obj = $this->field_settings_for($field_to_sum);
 
-		}else{
+		} else {
 			$field_obj = $this->get_primary_key_field();
 		}
 		$column_to_count = $field_obj->get_qualified_column();
 
-		$SQL ="SELECT SUM(".$column_to_count.")" . $this->_construct_2nd_half_of_select_query($model_query_info);
-		$return_value = $this->_do_wpdb_query('get_var',array( $SQL ) );
-		if($field_obj->get_wpdb_data_type() == '%d' || $field_obj->get_wpdb_data_type() == '%s' ){
-			return (int)$return_value;
-		}else{//must be %f
-			return (float)$return_value;
+		$SQL = "SELECT SUM(".$column_to_count.")".$this->_construct_2nd_half_of_select_query($model_query_info);
+		$return_value = $this->_do_wpdb_query('get_var', array($SQL));
+		if ($field_obj->get_wpdb_data_type() == '%d' || $field_obj->get_wpdb_data_type() == '%s') {
+			return (int) $return_value;
+		} else {//must be %f
+			return (float) $return_value;
 		}
 	}
 
@@ -1587,34 +1587,34 @@ 
 	 * @global wpdb $wpdb
 	 * @return mixed
 	 */
-	protected function _do_wpdb_query( $wpdb_method, $arguments_to_provide ){
+	protected function _do_wpdb_query($wpdb_method, $arguments_to_provide) {
 		//if we're in maintenance mode level 2, DON'T run any queries
 		//because level 2 indicates the database needs updating and
 		//is probably out of sync with the code
-		if( ! EE_Maintenance_Mode::instance()->models_can_query()){
+		if ( ! EE_Maintenance_Mode::instance()->models_can_query()) {
 			throw new EE_Error(sprintf(__("Event Espresso Level 2 Maintenance mode is active. That means EE can not run ANY database queries until the necessary migration scripts have run which will take EE out of maintenance mode level 2. Please inform support of this error.", "event_espresso")));
 		}
 		global $wpdb;
-		if( ! method_exists( $wpdb, $wpdb_method ) ){
-			throw new EE_Error( sprintf( __( 'There is no method named "%s" on Wordpress\' $wpdb object','event_espresso' ), $wpdb_method ) );
+		if ( ! method_exists($wpdb, $wpdb_method)) {
+			throw new EE_Error(sprintf(__('There is no method named "%s" on Wordpress\' $wpdb object', 'event_espresso'), $wpdb_method));
 		}
-		if( WP_DEBUG ){
+		if (WP_DEBUG) {
 			$wpdb->last_error = NULL;
 			$old_show_errors_value = $wpdb->show_errors;
-			$wpdb->show_errors( FALSE );
+			$wpdb->show_errors(FALSE);
 		}
 
-		$result = call_user_func_array( array( $wpdb, $wpdb_method ) , $arguments_to_provide );
-		$this->show_db_query_if_previously_requested( $wpdb->last_query );
-		if( WP_DEBUG ){
-			$wpdb->show_errors( $old_show_errors_value );
-			if( ! empty( $wpdb->last_error ) ){
-				throw new EE_Error( sprintf( __( 'WPDB Error: "%s"', 'event_espresso' ), $wpdb->last_error ) );
-			}elseif( $result === false ){
-				throw new EE_Error( sprintf( __( 'WPDB Error occurred, but no error message was logged by wpdb! The wpdb method called was "%1$s" and the arguments were "%2$s"', 'event_espresso' ), $wpdb_method, var_export( $arguments_to_provide, true ) ) );
+		$result = call_user_func_array(array($wpdb, $wpdb_method), $arguments_to_provide);
+		$this->show_db_query_if_previously_requested($wpdb->last_query);
+		if (WP_DEBUG) {
+			$wpdb->show_errors($old_show_errors_value);
+			if ( ! empty($wpdb->last_error)) {
+				throw new EE_Error(sprintf(__('WPDB Error: "%s"', 'event_espresso'), $wpdb->last_error));
+			}elseif ($result === false) {
+				throw new EE_Error(sprintf(__('WPDB Error occurred, but no error message was logged by wpdb! The wpdb method called was "%1$s" and the arguments were "%2$s"', 'event_espresso'), $wpdb_method, var_export($arguments_to_provide, true)));
 			}
-		}elseif( $result === false ) {
-			EE_Error::add_error( sprintf( __( 'A database error has occurred. Turn on WP_DEBUG for more information.', 'event_espresso' )), __FILE__, __FUNCTION__, __LINE__);
+		}elseif ($result === false) {
+			EE_Error::add_error(sprintf(__('A database error has occurred. Turn on WP_DEBUG for more information.', 'event_espresso')), __FILE__, __FUNCTION__, __LINE__);
 		}
 		return $result;
 	}
@@ -1626,7 +1626,7 @@ 
 	 * @param EE_Model_Query_Info_Carrier $model_query_info
 	 * @return string
 	 */
-	private function _construct_2nd_half_of_select_query(EE_Model_Query_Info_Carrier $model_query_info){
+	private function _construct_2nd_half_of_select_query(EE_Model_Query_Info_Carrier $model_query_info) {
 		return " FROM ".$model_query_info->get_full_join_sql().
 				$model_query_info->get_where_sql().
 				$model_query_info->get_group_by_sql().
@@ -1639,7 +1639,7 @@ 
 	 * Set to easily debug the next X queries ran from this model.
 	 * @param int $count
 	 */
-	function show_next_x_db_queries($count = 1){
+	function show_next_x_db_queries($count = 1) {
 		$this->_show_next_x_db_queries = $count;
 	}
 
@@ -1648,8 +1648,8 @@ 
 	/**
 	 * @param $sql_query
 	 */
-	function show_db_query_if_previously_requested($sql_query){
-		if($this->_show_next_x_db_queries > 0){
+	function show_db_query_if_previously_requested($sql_query) {
+		if ($this->_show_next_x_db_queries > 0) {
 			echo $sql_query;
 			$this->_show_next_x_db_queries--;
 		}
@@ -1673,7 +1673,7 @@ 
 	 * @param array   $where_query This allows you to enter further query params for the relation to for relation to methods that allow you to further specify extra columns to join by (such as HABTM).  Keep in mind that the only acceptable query_params is strict "col" => "value" pairs because these will be inserted in any new rows created as well.
 	 * @return EE_Base_Class which was added as a relation. Object referred to by $other_model_id_or_obj
 	 */
-	public function add_relationship_to($id_or_obj,$other_model_id_or_obj, $relationName, $where_query = array()){
+	public function add_relationship_to($id_or_obj, $other_model_id_or_obj, $relationName, $where_query = array()) {
 		$relation_obj = $this->related_settings_for($relationName);
 		return $relation_obj->add_relation_to($id_or_obj, $other_model_id_or_obj, $where_query);
 	}
@@ -1694,9 +1694,9 @@ 
 	 * @return boolean of success
 	 * @param array   $where_query This allows you to enter further query params for the relation to for relation to methods that allow you to further specify extra columns to join by (such as HABTM).  Keep in mind that the only acceptable query_params is strict "col" => "value" pairs because these will be inserted in any new rows created as well.
 	 */
-	public function remove_relationship_to($id_or_obj,  $other_model_id_or_obj, $relationName, $where_query= array() ){
+	public function remove_relationship_to($id_or_obj, $other_model_id_or_obj, $relationName, $where_query = array()) {
 		$relation_obj = $this->related_settings_for($relationName);
-		return $relation_obj->remove_relation_to($id_or_obj, $other_model_id_or_obj, $where_query );
+		return $relation_obj->remove_relation_to($id_or_obj, $other_model_id_or_obj, $where_query);
 	}
 
 
@@ -1709,9 +1709,9 @@ 
 	 * @param EE_Base_Class[] objects to which relations were removed
 	 * @return \EE_Base_Class[]
 	 */
-	public function remove_relations($id_or_obj,$relationName,$where_query_params = array()){
+	public function remove_relations($id_or_obj, $relationName, $where_query_params = array()) {
 		$relation_obj = $this->related_settings_for($relationName);
-		return $relation_obj->remove_relations($id_or_obj, $where_query_params );
+		return $relation_obj->remove_relations($id_or_obj, $where_query_params);
 	}
 
 
@@ -1724,10 +1724,10 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return EE_Base_Class[]
 	 */
-	function get_all_related($id_or_obj, $model_name, $query_params = null){
+	function get_all_related($id_or_obj, $model_name, $query_params = null) {
 		$model_obj = $this->ensure_is_obj($id_or_obj);
 		$relation_settings = $this->related_settings_for($model_name);
-		return $relation_settings->get_all_related($model_obj,$query_params);
+		return $relation_settings->get_all_related($model_obj, $query_params);
 	}
 
 	/**
@@ -1740,10 +1740,10 @@ 
 	 * @param array $query_params
 	 * @return int how many deleted
 	 */
-	public function delete_related($id_or_obj,$model_name, $query_params = array()){
+	public function delete_related($id_or_obj, $model_name, $query_params = array()) {
 		$model_obj = $this->ensure_is_obj($id_or_obj);
 		$relation_settings = $this->related_settings_for($model_name);
-		return $relation_settings->delete_all_related($model_obj,$query_params);
+		return $relation_settings->delete_all_related($model_obj, $query_params);
 	}
 
 	/**
@@ -1756,10 +1756,10 @@ 
 	 * @param array $query_params
 	 * @return int how many deleted
 	 */
-	public function delete_related_permanently($id_or_obj,$model_name, $query_params = array()){
+	public function delete_related_permanently($id_or_obj, $model_name, $query_params = array()) {
 		$model_obj = $this->ensure_is_obj($id_or_obj);
 		$relation_settings = $this->related_settings_for($model_name);
-		return $relation_settings->delete_related_permanently($model_obj,$query_params);
+		return $relation_settings->delete_related_permanently($model_obj, $query_params);
 	}
 
 	/**
@@ -1772,17 +1772,17 @@ 
 	 * @param bool 	 $distinct if we want to only count the distinct values for the column then you can trigger that by the setting $distinct to TRUE;
 	 * @return int
 	 */
-	function count_related($id_or_obj,$model_name,$query_params = array(),$field_to_count = null, $distinct = FALSE){
+	function count_related($id_or_obj, $model_name, $query_params = array(), $field_to_count = null, $distinct = FALSE) {
 		$related_model = $this->get_related_model_obj($model_name);
 		//we're just going to use the query params on the related model's normal get_all query,
 		//except add a condition to say to match the current mod
-		if( ! isset($query_params['default_where_conditions'])){
-			$query_params['default_where_conditions']='none';
+		if ( ! isset($query_params['default_where_conditions'])) {
+			$query_params['default_where_conditions'] = 'none';
 		}
 		$this_model_name = $this->get_this_model_name();
 		$this_pk_field_name = $this->get_primary_key_field()->get_name();
-		$query_params[0][$this_model_name.".".$this_pk_field_name]=$id_or_obj;
-		return $related_model->count($query_params,$field_to_count,$distinct);
+		$query_params[0][$this_model_name.".".$this_pk_field_name] = $id_or_obj;
+		return $related_model->count($query_params, $field_to_count, $distinct);
 	}
 
 
@@ -1796,21 +1796,21 @@ 
 	 * @param string $field_to_sum name of field to count by. By default, uses primary key
 	 * @return int
 	 */
-	function sum_related($id_or_obj,$model_name,$query_params,$field_to_sum = null){
+	function sum_related($id_or_obj, $model_name, $query_params, $field_to_sum = null) {
 		$related_model = $this->get_related_model_obj($model_name);
-		if( ! is_array( $query_params ) ){
-			EE_Error::doing_it_wrong('EEM_Base::sum_related', sprintf( __( '$query_params should be an array, you passed a variable of type %s', 'event_espresso' ), gettype( $query_params ) ), '4.6.0' );
+		if ( ! is_array($query_params)) {
+			EE_Error::doing_it_wrong('EEM_Base::sum_related', sprintf(__('$query_params should be an array, you passed a variable of type %s', 'event_espresso'), gettype($query_params)), '4.6.0');
 			$query_params = array();
 		}
 		//we're just going to use the query params on the related model's normal get_all query,
 		//except add a condition to say to match the current mod
-		if( ! isset($query_params['default_where_conditions'])){
-			$query_params['default_where_conditions']='none';
+		if ( ! isset($query_params['default_where_conditions'])) {
+			$query_params['default_where_conditions'] = 'none';
 		}
 		$this_model_name = $this->get_this_model_name();
 		$this_pk_field_name = $this->get_primary_key_field()->get_name();
-		$query_params[0][$this_model_name.".".$this_pk_field_name]=$id_or_obj;
-		return $related_model->sum($query_params,$field_to_sum);
+		$query_params[0][$this_model_name.".".$this_pk_field_name] = $id_or_obj;
+		return $related_model->sum($query_params, $field_to_sum);
 	}
 
 
@@ -1822,12 +1822,12 @@ 
 	 * @param array $query_params like EEM_Base::get_all's
 	 * @return EE_Base_Class
 	 */
-	public function get_first_related( EE_Base_Class $id_or_obj, $other_model_name, $query_params ){
-		$query_params['limit']=1;
-		$results = $this->get_all_related($id_or_obj,$other_model_name,$query_params);
-		if( $results ){
+	public function get_first_related(EE_Base_Class $id_or_obj, $other_model_name, $query_params) {
+		$query_params['limit'] = 1;
+		$results = $this->get_all_related($id_or_obj, $other_model_name, $query_params);
+		if ($results) {
 			return array_shift($results);
-		}else{
+		} else {
 			return null;
 		}
 
@@ -1837,8 +1837,8 @@ 
 	 * Gets the model's name as it's expected in queries. For example, if this is EEM_Event model, that would be Event
 	 * @return string
 	 */
-	function get_this_model_name(){
-		return str_replace("EEM_","",get_class($this));
+	function get_this_model_name() {
+		return str_replace("EEM_", "", get_class($this));
 	}
 
 	/**
@@ -1846,14 +1846,14 @@ 
 	 * @return EE_Any_Foreign_Model_Name_Field
 	 * @throws EE_Error
 	 */
-	public function get_field_containing_related_model_name(){
-		foreach($this->field_settings(true) as $field){
-			if($field instanceof EE_Any_Foreign_Model_Name_Field){
+	public function get_field_containing_related_model_name() {
+		foreach ($this->field_settings(true) as $field) {
+			if ($field instanceof EE_Any_Foreign_Model_Name_Field) {
 				$field_with_model_name = $field;
 			}
 		}
-		if( !isset($field_with_model_name) || !$field_with_model_name ){
-			throw new EE_Error(sprintf(__("There is no EE_Any_Foreign_Model_Name field on model %s", "event_espresso"), $this->get_this_model_name() ));
+		if ( ! isset($field_with_model_name) || ! $field_with_model_name) {
+			throw new EE_Error(sprintf(__("There is no EE_Any_Foreign_Model_Name field on model %s", "event_espresso"), $this->get_this_model_name()));
 		}
 		return $field_with_model_name;
 	}
@@ -1874,19 +1874,19 @@ 
 	 * @return int new primary key on main table that got inserted
 	 * @throws EE_Error
 	 */
-	function insert($field_n_values){
+	function insert($field_n_values) {
 		/**
 		 * Filters the fields and their values before inserting an item using the models
 		 * @param array $fields_n_values keys are the fields and values are their new values
 		 * @param EEM_Base $model the model used
 		 */
-		$field_n_values = apply_filters( 'FHEE__EEM_Base__insert__fields_n_values', $field_n_values, $this );
-		if($this->_satisfies_unique_indexes($field_n_values)){
+		$field_n_values = apply_filters('FHEE__EEM_Base__insert__fields_n_values', $field_n_values, $this);
+		if ($this->_satisfies_unique_indexes($field_n_values)) {
 			$main_table = $this->_get_main_table();
 			$new_id = $this->_insert_into_specific_table($main_table, $field_n_values, false);
-			if( $new_id !== false ) {
-				foreach($this->_get_other_tables() as $other_table){
-					$this->_insert_into_specific_table($other_table, $field_n_values,$new_id);
+			if ($new_id !== false) {
+				foreach ($this->_get_other_tables() as $other_table) {
+					$this->_insert_into_specific_table($other_table, $field_n_values, $new_id);
 				}
 			}
 			/**
@@ -1896,9 +1896,9 @@ 
 			 * @param array $fields_n_values fields and their values
 			 * @param int|string the ID of the newly-inserted model object
 			 */
-			do_action( 'AHEE__EEM_Base__insert__end', $this, $field_n_values, $new_id );
+			do_action('AHEE__EEM_Base__insert__end', $this, $field_n_values, $new_id);
 			return $new_id;
-		}else{
+		} else {
 			return FALSE;
 		}
 	}
@@ -1911,11 +1911,11 @@ 
 	 * @param string $action
 	 * @return boolean
 	 */
-	protected function _satisfies_unique_indexes($field_n_values,$action = 'insert'){
-		foreach($this->unique_indexes() as $index_name => $index){
+	protected function _satisfies_unique_indexes($field_n_values, $action = 'insert') {
+		foreach ($this->unique_indexes() as $index_name => $index) {
 			$uniqueness_where_params = array_intersect_key($field_n_values, $index->fields());
-			if($this->exists(array($uniqueness_where_params))){
-				EE_Error::add_error(sprintf(__("Could not %s %s. %s uniqueness index failed. Fields %s must form a unique set, but an entry already exists with values %s.", "event_espresso"),$action,$this->_get_class_name(),$index_name,implode(",",$index->field_names()),http_build_query($uniqueness_where_params)), __FILE__, __FUNCTION__, __LINE__ );
+			if ($this->exists(array($uniqueness_where_params))) {
+				EE_Error::add_error(sprintf(__("Could not %s %s. %s uniqueness index failed. Fields %s must form a unique set, but an entry already exists with values %s.", "event_espresso"), $action, $this->_get_class_name(), $index_name, implode(",", $index->field_names()), http_build_query($uniqueness_where_params)), __FILE__, __FUNCTION__, __LINE__);
 				return false;
 			}
 		}
@@ -1936,28 +1936,28 @@ 
 	 * @throws EE_Error
 	 * @return EE_Base_Class
 	 */
-	public function get_one_conflicting($obj_or_fields_array, $include_primary_key = true ){
-		if($obj_or_fields_array instanceof EE_Base_Class){
+	public function get_one_conflicting($obj_or_fields_array, $include_primary_key = true) {
+		if ($obj_or_fields_array instanceof EE_Base_Class) {
 			$fields_n_values = $obj_or_fields_array->model_field_array();
-		}elseif( is_array($obj_or_fields_array)){
+		}elseif (is_array($obj_or_fields_array)) {
 			$fields_n_values = $obj_or_fields_array;
-		}else{
-			throw new EE_Error(sprintf(__("%s get_all_conflicting should be called with a model object or an array of field names and values, you provided %d", "event_espresso"),get_class($this),$obj_or_fields_array));
+		} else {
+			throw new EE_Error(sprintf(__("%s get_all_conflicting should be called with a model object or an array of field names and values, you provided %d", "event_espresso"), get_class($this), $obj_or_fields_array));
 		}
 		$query_params = array();
-		if( $this->has_primary_key_field() &&
-				( $include_primary_key || $this->get_primary_key_field() instanceof EE_Primary_Key_String_Field) &&
-				isset($fields_n_values[$this->primary_key_name()])){
+		if ($this->has_primary_key_field() &&
+				($include_primary_key || $this->get_primary_key_field() instanceof EE_Primary_Key_String_Field) &&
+				isset($fields_n_values[$this->primary_key_name()])) {
 			$query_params[0]['OR'][$this->primary_key_name()] = $fields_n_values[$this->primary_key_name()];
 		}
-		foreach($this->unique_indexes() as $unique_index_name=>$unique_index){
+		foreach ($this->unique_indexes() as $unique_index_name=>$unique_index) {
 			$uniqueness_where_params = array_intersect_key($fields_n_values, $unique_index->fields());
 			$query_params[0]['OR']['AND*'.$unique_index_name] = $uniqueness_where_params;
 		}
 		//if there is nothing to base this search on, then we shouldn't find anything
-		if( empty( $query_params ) ){
+		if (empty($query_params)) {
 			return array();
-		}else{
+		} else {
 			return $this->get_one($query_params);
 		}
 	}
@@ -1967,7 +1967,7 @@ 
 	 * @param array $query_params
 	 * @return boolean
 	 */
-	function exists($query_params){
+	function exists($query_params) {
 		$query_params['limit'] = 1;
 		return $this->count($query_params) > 0;
 	}
@@ -1977,7 +1977,7 @@ 
 	 * @param int|string $id
 	 * @return boolean
 	 */
-	function exists_by_ID($id){
+	function exists_by_ID($id) {
 		return $this->exists(array('default_where_conditions'=>'none', array($this->primary_key_name() => $id)));
 	}
 
@@ -1997,45 +1997,45 @@ 
 	 * @global WPDB $wpdb only used to get the $wpdb->insert_id after performing an insert
 	 * @return int ID of new row inserted, or FALSE on failure
 	 */
-	protected function _insert_into_specific_table(EE_Table_Base $table, $fields_n_values, $new_id = 0 ){
+	protected function _insert_into_specific_table(EE_Table_Base $table, $fields_n_values, $new_id = 0) {
 		global $wpdb;
 		$insertion_col_n_values = array();
 		$format_for_insertion = array();
 		$fields_on_table = $this->_get_fields_for_table($table->get_table_alias());
-		foreach($fields_on_table as $field_name => $field_obj){
+		foreach ($fields_on_table as $field_name => $field_obj) {
 			//check if its an auto-incrementing column, in which case we should just leave it to do its autoincrement thing
-			if($field_obj->is_auto_increment()){
+			if ($field_obj->is_auto_increment()) {
 				continue;
 			}
 			$prepared_value = $this->_prepare_value_or_use_default($field_obj, $fields_n_values);
 			//if the value we want to assign it to is NULL, just don't mention it for the insertion
-			if( $prepared_value !== NULL ){
-				$insertion_col_n_values[ $field_obj->get_table_column() ] = $prepared_value;
+			if ($prepared_value !== NULL) {
+				$insertion_col_n_values[$field_obj->get_table_column()] = $prepared_value;
 				$format_for_insertion[] = $field_obj->get_wpdb_data_type();
 			}
 		}
 
-		if($table instanceof EE_Secondary_Table && $new_id){
+		if ($table instanceof EE_Secondary_Table && $new_id) {
 			//its not the main table, so we should have already saved the main table's PK which we just inserted
 			//so add the fk to the main table as a column
 			$insertion_col_n_values[$table->get_fk_on_table()] = $new_id;
-			$format_for_insertion[]='%d';//yes right now we're only allowing these foreign keys to be INTs
+			$format_for_insertion[] = '%d'; //yes right now we're only allowing these foreign keys to be INTs
 		}
 		//insert the new entry
-		$result = $this->_do_wpdb_query( 'insert', array( $table->get_table_name(), $insertion_col_n_values, $format_for_insertion ) );
-		if( $result === false ) {
+		$result = $this->_do_wpdb_query('insert', array($table->get_table_name(), $insertion_col_n_values, $format_for_insertion));
+		if ($result === false) {
 			return false;
 		}
 		//ok, now what do we return for the ID of the newly-inserted thing?
-		if($this->has_primary_key_field()){
-			if($this->get_primary_key_field()->is_auto_increment()){
+		if ($this->has_primary_key_field()) {
+			if ($this->get_primary_key_field()->is_auto_increment()) {
 				return $wpdb->insert_id;
-			}else{
+			} else {
 				//it's not an auto-increment primary key, so
 				//it must have been supplied
 				return $fields_n_values[$this->get_primary_key_field()->get_name()];
 			}
-		}else{
+		} else {
 			//we can't return a  primary key because there is none. instead return
 			//a unique string indicating this model
 			return $this->get_index_primary_key_string($fields_n_values);
@@ -2050,15 +2050,15 @@ 
 	 * @param array $fields_n_values
 	 * @return mixed string|int|float depending on what the table column will be expecting
 	 */
-	protected function _prepare_value_or_use_default( $field_obj, $fields_n_values ){
+	protected function _prepare_value_or_use_default($field_obj, $fields_n_values) {
 		//if this field doesn't allow nullable, don't allow it
-		if( ! $field_obj->is_nullable() && (
-				! isset( $fields_n_values[ $field_obj->get_name() ] ) ||
-				$fields_n_values[ $field_obj->get_name() ] === NULL ) ){
-			$fields_n_values[ $field_obj->get_name() ] = $field_obj->get_default_value();
+		if ( ! $field_obj->is_nullable() && (
+				! isset($fields_n_values[$field_obj->get_name()]) ||
+				$fields_n_values[$field_obj->get_name()] === NULL )) {
+			$fields_n_values[$field_obj->get_name()] = $field_obj->get_default_value();
 		}
-		$unprepared_value = isset( $fields_n_values[ $field_obj->get_name() ] ) ? $fields_n_values[ $field_obj->get_name() ] : NULL;
-		return $this->_prepare_value_for_use_in_db( $unprepared_value, $field_obj);
+		$unprepared_value = isset($fields_n_values[$field_obj->get_name()]) ? $fields_n_values[$field_obj->get_name()] : NULL;
+		return $this->_prepare_value_for_use_in_db($unprepared_value, $field_obj);
 	}
 
 
@@ -2070,9 +2070,9 @@ 
 	 * @param EE_Model_Field_Base $field field which will be doing the preparing of the value. If null, we assume $value is a custom selection
 	 * @return mixed a value ready for use in the database for insertions, updating, or in a where clause
 	 */
-	private function _prepare_value_for_use_in_db($value, $field){
-		if($field && $field instanceof EE_Model_Field_Base){
-			switch( $this->_values_already_prepared_by_model_object ){
+	private function _prepare_value_for_use_in_db($value, $field) {
+		if ($field && $field instanceof EE_Model_Field_Base) {
+			switch ($this->_values_already_prepared_by_model_object) {
 				case self::not_prepared_by_model_object:
 					$value = $field->prepare_for_set($value);
 					//purposefully left out "return"
@@ -2082,7 +2082,7 @@ 
 					//leave the value alone
 			}
 			return $value;
-		}else{
+		} else {
 			return $value;
 		}
 	}
@@ -2092,13 +2092,13 @@ 
 	 * @return EE_Primary_Table
 	 * @throws EE_Error
 	 */
-	protected function _get_main_table(){
-		foreach($this->_tables as $table){
-			if($table instanceof EE_Primary_Table){
+	protected function _get_main_table() {
+		foreach ($this->_tables as $table) {
+			if ($table instanceof EE_Primary_Table) {
 				return $table;
 			}
 		}
-		throw new EE_Error(sprintf(__('There are no main tables on %s. They should be added to _tables array in the constructor','event_espresso'),get_class($this)));
+		throw new EE_Error(sprintf(__('There are no main tables on %s. They should be added to _tables array in the constructor', 'event_espresso'), get_class($this)));
 	}
 
 	/**
@@ -2117,7 +2117,7 @@ 
 	 */
 	public function second_table() {
 		// grab second table from tables array
-		$second_table = end( $this->_tables );
+		$second_table = end($this->_tables);
 		return $second_table instanceof EE_Secondary_Table ? $second_table->get_table_name() : NULL;
 	}
 
@@ -2130,8 +2130,8 @@ 
 	 * @param string $table_alias
 	 * @return EE_Primary_Table | EE_Secondary_Table
 	 */
-	public function get_table_obj_by_alias( $table_alias = '' ) {
-		return isset( $this->_tables[ $table_alias ] ) ? $this->_tables[ $table_alias ] : NULL;
+	public function get_table_obj_by_alias($table_alias = '') {
+		return isset($this->_tables[$table_alias]) ? $this->_tables[$table_alias] : NULL;
 	}
 
 
@@ -2140,10 +2140,10 @@ 
 	 * Gets all the tables of type EE_Other_Table from EEM_CPT_Basel_Model::_tables
 	 * @return EE_Secondary_Table[]
 	 */
-	protected function _get_other_tables(){
-		$other_tables =array();
-		foreach($this->_tables as $table_alias => $table){
-			if($table instanceof EE_Secondary_Table){
+	protected function _get_other_tables() {
+		$other_tables = array();
+		foreach ($this->_tables as $table_alias => $table) {
+			if ($table instanceof EE_Secondary_Table) {
 				$other_tables[$table_alias] = $table;
 			}
 		}
@@ -2155,7 +2155,7 @@ 
 	 * @param string $table_alias, array key in EEM_Base::_tables
 	 * @return EE_Model_Field_Base[]
 	 */
-	function _get_fields_for_table($table_alias){
+	function _get_fields_for_table($table_alias) {
 		return $this->_fields[$table_alias];
 	}
 
@@ -2167,29 +2167,29 @@ 
 	 * @param array $query_params like EEM_Base::get_all's $query_parameters['where']
 	 * @return EE_Model_Query_Info_Carrier
 	 */
-	function _extract_related_models_from_query($query_params){
+	function _extract_related_models_from_query($query_params) {
 		$query_info_carrier = new EE_Model_Query_Info_Carrier();
-		if(array_key_exists(0,$query_params)){
-			$this->_extract_related_models_from_sub_params_array_keys($query_params[0], $query_info_carrier,0);
-		}
-		if(array_key_exists('group_by', $query_params)){
-			if(is_array($query_params['group_by'])){
-				$this->_extract_related_models_from_sub_params_array_values($query_params['group_by'],$query_info_carrier,'group_by');
-			}elseif( ! empty ( $query_params['group_by'] )){
-				$this->_extract_related_model_info_from_query_param( $query_params['group_by'],$query_info_carrier,'group_by');
+		if (array_key_exists(0, $query_params)) {
+			$this->_extract_related_models_from_sub_params_array_keys($query_params[0], $query_info_carrier, 0);
+		}
+		if (array_key_exists('group_by', $query_params)) {
+			if (is_array($query_params['group_by'])) {
+				$this->_extract_related_models_from_sub_params_array_values($query_params['group_by'], $query_info_carrier, 'group_by');
+			}elseif ( ! empty ($query_params['group_by'])) {
+				$this->_extract_related_model_info_from_query_param($query_params['group_by'], $query_info_carrier, 'group_by');
 			}
 		}
-		if(array_key_exists('having',$query_params)){
-			$this->_extract_related_models_from_sub_params_array_keys($query_params[0], $query_info_carrier,'having');
+		if (array_key_exists('having', $query_params)) {
+			$this->_extract_related_models_from_sub_params_array_keys($query_params[0], $query_info_carrier, 'having');
 		}
-		if(array_key_exists('order_by', $query_params)){
-			if ( is_array( $query_params['order_by'] ) )
-				$this->_extract_related_models_from_sub_params_array_keys($query_params['order_by'],$query_info_carrier,'order_by');
-			elseif( ! empty( $query_params['order_by'] ))
-				$this->_extract_related_model_info_from_query_param( $query_params['order_by'], $query_info_carrier,'order_by');
+		if (array_key_exists('order_by', $query_params)) {
+			if (is_array($query_params['order_by']))
+				$this->_extract_related_models_from_sub_params_array_keys($query_params['order_by'], $query_info_carrier, 'order_by');
+			elseif ( ! empty($query_params['order_by']))
+				$this->_extract_related_model_info_from_query_param($query_params['order_by'], $query_info_carrier, 'order_by');
 		}
-		if(array_key_exists('force_join', $query_params)){
-			$this->_extract_related_models_from_sub_params_array_values($query_params['force_join'],$query_info_carrier,'force_join');
+		if (array_key_exists('force_join', $query_params)) {
+			$this->_extract_related_models_from_sub_params_array_values($query_params['force_join'], $query_info_carrier, 'force_join');
 		}
 		return $query_info_carrier;
 	}
@@ -2202,34 +2202,34 @@ 
 	 * @throws EE_Error
 	 * @return \EE_Model_Query_Info_Carrier
 	 */
-	private function _extract_related_models_from_sub_params_array_keys($sub_query_params, EE_Model_Query_Info_Carrier $model_query_info_carrier,$query_param_type){
-		if (!empty($sub_query_params)){
+	private function _extract_related_models_from_sub_params_array_keys($sub_query_params, EE_Model_Query_Info_Carrier $model_query_info_carrier, $query_param_type) {
+		if ( ! empty($sub_query_params)) {
 			$sub_query_params = (array) $sub_query_params;
-			foreach($sub_query_params as $param => $possibly_array_of_params){
+			foreach ($sub_query_params as $param => $possibly_array_of_params) {
 				//$param could be simply 'EVT_ID', or it could be 'Registrations.REG_ID', or even 'Registrations.Transactions.Payments.PAY_amount'
-				$this->_extract_related_model_info_from_query_param( $param, $model_query_info_carrier,$query_param_type);
+				$this->_extract_related_model_info_from_query_param($param, $model_query_info_carrier, $query_param_type);
 
 				//if $possibly_array_of_params is an array, try recursing into it, searching for keys which
 				//indicate needed joins. Eg, array('NOT'=>array('Registration.TXN_ID'=>23)). In this case, we tried
 				//extracting models out of the 'NOT', which obviously wasn't successful, and then we recurse into the value
 				//of array('Registration.TXN_ID'=>23)
 				$query_param_sans_stars = $this->_remove_stars_and_anything_after_from_condition_query_param_key($param);
-				if(in_array($query_param_sans_stars, $this->_logic_query_param_keys,true)){
-					if (! is_array($possibly_array_of_params)){
+				if (in_array($query_param_sans_stars, $this->_logic_query_param_keys, true)) {
+					if ( ! is_array($possibly_array_of_params)) {
 						throw new EE_Error(sprintf(__("You used a special where query param %s, but the value isn't an array of where query params, it's just %s'. It should be an array, eg array('EVT_ID'=>23,'OR'=>array('Venue.VNU_ID'=>32,'Venue.VNU_name'=>'monkey_land'))", "event_espresso"),
-							$param,$possibly_array_of_params));
-					}else{
-						$this->_extract_related_models_from_sub_params_array_keys($possibly_array_of_params, $model_query_info_carrier,$query_param_type);
+							$param, $possibly_array_of_params));
+					} else {
+						$this->_extract_related_models_from_sub_params_array_keys($possibly_array_of_params, $model_query_info_carrier, $query_param_type);
 					}
-				}elseif($query_param_type === 0 //ie WHERE
+				}elseif ($query_param_type === 0 //ie WHERE
 						&& is_array($possibly_array_of_params)
 						&& isset($possibly_array_of_params[2])
-						&& $possibly_array_of_params[2] == true){
+						&& $possibly_array_of_params[2] == true) {
 					//then $possible_array_of_params looks something like array('<','DTT_sold',true)
 					//indicating that $possible_array_of_params[1] is actually a field name,
 					//from which we should extract query parameters!
-					if(! isset($possibly_array_of_params[0]) || ! isset($possibly_array_of_params[1])){
-						throw new EE_Error(sprintf(__("Improperly formed query parameter %s. It should be numerically indexed like array('<','DTT_sold',true); but you provided %s", "event_espresso"),$query_param_type,implode(",",$possibly_array_of_params)));
+					if ( ! isset($possibly_array_of_params[0]) || ! isset($possibly_array_of_params[1])) {
+						throw new EE_Error(sprintf(__("Improperly formed query parameter %s. It should be numerically indexed like array('<','DTT_sold',true); but you provided %s", "event_espresso"), $query_param_type, implode(",", $possibly_array_of_params)));
 					}
 					$this->_extract_related_model_info_from_query_param($possibly_array_of_params[1], $model_query_info_carrier, $query_param_type);
 				}
@@ -2248,14 +2248,14 @@ 
 	 * @throws EE_Error
 	 * @return \EE_Model_Query_Info_Carrier
 	 */
-	private function _extract_related_models_from_sub_params_array_values($sub_query_params, EE_Model_Query_Info_Carrier $model_query_info_carrier,$query_param_type){
-		if (!empty($sub_query_params)){
-			if(!is_array($sub_query_params)){
-				throw new EE_Error(sprintf(__("Query parameter %s should be an array, but it isn't.", "event_espresso"),$sub_query_params));
+	private function _extract_related_models_from_sub_params_array_values($sub_query_params, EE_Model_Query_Info_Carrier $model_query_info_carrier, $query_param_type) {
+		if ( ! empty($sub_query_params)) {
+			if ( ! is_array($sub_query_params)) {
+				throw new EE_Error(sprintf(__("Query parameter %s should be an array, but it isn't.", "event_espresso"), $sub_query_params));
 			}
-			foreach($sub_query_params as $param){
+			foreach ($sub_query_params as $param) {
 				//$param could be simply 'EVT_ID', or it could be 'Registrations.REG_ID', or even 'Registrations.Transactions.Payments.PAY_amount'
-				$this->_extract_related_model_info_from_query_param( $param, $model_query_info_carrier, $query_param_type);
+				$this->_extract_related_model_info_from_query_param($param, $model_query_info_carrier, $query_param_type);
 			}
 		}
 		return $model_query_info_carrier;
@@ -2274,81 +2274,81 @@ 
 	 * @throws EE_Error
 	 * @return EE_Model_Query_Info_Carrier
 	 */
-	function _create_model_query_info_carrier($query_params){
-		if( isset( $query_params[0] ) ) {
+	function _create_model_query_info_carrier($query_params) {
+		if (isset($query_params[0])) {
 			$where_query_params = $query_params[0];
-		}else{
+		} else {
 			$where_query_params = array();
 		}
 		//first check if we should alter the query to account for caps or not
 		//because the caps might require us to do extra joins
-		if( isset( $query_params[ 'caps' ] ) && $query_params[ 'caps' ] != 'none' ) {
-			$query_params[0] = $where_query_params = array_replace_recursive( $where_query_params, $this->caps_where_conditions( $query_params[ 'caps' ] ) );
+		if (isset($query_params['caps']) && $query_params['caps'] != 'none') {
+			$query_params[0] = $where_query_params = array_replace_recursive($where_query_params, $this->caps_where_conditions($query_params['caps']));
 		}
-		if( ! is_array( $query_params ) ){
-			EE_Error::doing_it_wrong('EEM_Base::_create_model_query_info_carrier', sprintf( __( '$query_params should be an array, you passed a variable of type %s', 'event_espresso' ), gettype( $query_params ) ), '4.6.0' );
+		if ( ! is_array($query_params)) {
+			EE_Error::doing_it_wrong('EEM_Base::_create_model_query_info_carrier', sprintf(__('$query_params should be an array, you passed a variable of type %s', 'event_espresso'), gettype($query_params)), '4.6.0');
 			$query_params = array();
 		}
 		$query_object = $this->_extract_related_models_from_query($query_params);
 
 		//verify where_query_params has NO numeric indexes.... that's simply not how you use it!
-		foreach($where_query_params as $key => $value){
-			if(is_int($key)){
-				throw new EE_Error(sprintf(__("WHERE query params must NOT be numerically-indexed. You provided the array key '%s' for value '%s' while querying model %s. All the query params provided were '%s' Please read documentation on EEM_Base::get_all.", "event_espresso"),$key, var_export( $value, true ), var_export( $query_params, true ), get_class($this)));
+		foreach ($where_query_params as $key => $value) {
+			if (is_int($key)) {
+				throw new EE_Error(sprintf(__("WHERE query params must NOT be numerically-indexed. You provided the array key '%s' for value '%s' while querying model %s. All the query params provided were '%s' Please read documentation on EEM_Base::get_all.", "event_espresso"), $key, var_export($value, true), var_export($query_params, true), get_class($this)));
 			}
 		}
-		if( array_key_exists( 'default_where_conditions',$query_params) && ! empty( $query_params['default_where_conditions'] )){
+		if (array_key_exists('default_where_conditions', $query_params) && ! empty($query_params['default_where_conditions'])) {
 			$use_default_where_conditions = $query_params['default_where_conditions'];
-		}else{
+		} else {
 			$use_default_where_conditions = 'all';
 		}
-		$where_query_params = array_merge($this->_get_default_where_conditions_for_models_in_query($query_object,$use_default_where_conditions,$where_query_params), $where_query_params );
-		$query_object->set_where_sql( $this->_construct_where_clause($where_query_params));
+		$where_query_params = array_merge($this->_get_default_where_conditions_for_models_in_query($query_object, $use_default_where_conditions, $where_query_params), $where_query_params);
+		$query_object->set_where_sql($this->_construct_where_clause($where_query_params));
 
 
 		//if this is a "on_join_limit" then we are limiting on on a specific table in a multi_table join.  So we need to setup a subquery and use that for the main join.  Note for now this only works on the primary table for the model.  So for instance, you could set the limit array like this:
 		//array( 'on_join_limit' => array('Primary_Table_Alias', array(1,10) ) )
-		if ( array_key_exists('on_join_limit', $query_params ) && ! empty( $query_params['on_join_limit'] )) {
-			$query_object->set_main_model_join_sql( $this->_construct_limit_join_select( $query_params['on_join_limit'][0], $query_params['on_join_limit'][1] ) );
+		if (array_key_exists('on_join_limit', $query_params) && ! empty($query_params['on_join_limit'])) {
+			$query_object->set_main_model_join_sql($this->_construct_limit_join_select($query_params['on_join_limit'][0], $query_params['on_join_limit'][1]));
 		}
 
 
 		//set limit
-		if(array_key_exists('limit',$query_params)){
-			if(is_array($query_params['limit'])){
-				if( ! isset($query_params['limit'][0]) || ! isset($query_params['limit'][1])){
-					$e = sprintf(__("Invalid DB query. You passed '%s' for the LIMIT, but only the following are valid: an integer, string representing an integer, a string like 'int,int', or an array like array(int,int)", "event_espresso"),  http_build_query($query_params['limit']));
+		if (array_key_exists('limit', $query_params)) {
+			if (is_array($query_params['limit'])) {
+				if ( ! isset($query_params['limit'][0]) || ! isset($query_params['limit'][1])) {
+					$e = sprintf(__("Invalid DB query. You passed '%s' for the LIMIT, but only the following are valid: an integer, string representing an integer, a string like 'int,int', or an array like array(int,int)", "event_espresso"), http_build_query($query_params['limit']));
 					throw new EE_Error($e."|".$e);
 				}
 				//they passed us an array for the limit. Assume it's like array(50,25), meaning offset by 50, and get 25
 				$query_object->set_limit_sql(" LIMIT ".$query_params['limit'][0].",".$query_params['limit'][1]);
-			}elseif( ! empty ( $query_params['limit'] )){
+			}elseif ( ! empty ($query_params['limit'])) {
 				$query_object->set_limit_sql((" LIMIT ".$query_params['limit']));
 			}
 		}
 		//set order by
-		if(array_key_exists('order_by',$query_params)){
-			if(is_array($query_params['order_by'])){
+		if (array_key_exists('order_by', $query_params)) {
+			if (is_array($query_params['order_by'])) {
 				//if they're using 'order_by' as an array, they can't use 'order' (because 'order_by' must
 				//specify whether to ascend or descend on each field. Eg 'order_by'=>array('EVT_ID'=>'ASC'). So
 				//including 'order' wouldn't make any sense if 'order_by' has already specified which way to order!
-				if(array_key_exists('order', $query_params)){
+				if (array_key_exists('order', $query_params)) {
 					throw new EE_Error(sprintf(__("In querying %s, we are using query parameter 'order_by' as an array (keys:%s,values:%s), and so we can't use query parameter 'order' (value %s). You should just use the 'order_by' parameter ", "event_espresso"),
-							get_class($this),implode(", ",array_keys($query_params['order_by'])),implode(", ",$query_params['order_by']),$query_params['order']));
+							get_class($this), implode(", ", array_keys($query_params['order_by'])), implode(", ", $query_params['order_by']), $query_params['order']));
 				}
-				 $this->_extract_related_models_from_sub_params_array_keys($query_params['order_by'],$query_object,'order_by');
+				 $this->_extract_related_models_from_sub_params_array_keys($query_params['order_by'], $query_object, 'order_by');
 				//assume it's an array of fields to order by
 				$order_array = array();
-				foreach($query_params['order_by'] as $field_name_to_order_by => $order){
+				foreach ($query_params['order_by'] as $field_name_to_order_by => $order) {
 					$order = $this->_extract_order($order);
 					$order_array[] = $this->_deduce_column_name_from_query_param($field_name_to_order_by).SP.$order;
 				}
-				$query_object->set_order_by_sql(" ORDER BY ".implode(",",$order_array));
-			}elseif( ! empty ( $query_params['order_by'] )){
-				$this->_extract_related_model_info_from_query_param($query_params['order_by'],$query_object,'order',$query_params['order_by']);
-				if(isset($query_params['order'])){
+				$query_object->set_order_by_sql(" ORDER BY ".implode(",", $order_array));
+			}elseif ( ! empty ($query_params['order_by'])) {
+				$this->_extract_related_model_info_from_query_param($query_params['order_by'], $query_object, 'order', $query_params['order_by']);
+				if (isset($query_params['order'])) {
 					$order = $this->_extract_order($query_params['order']);
-				}else{
+				} else {
 					$order = 'DESC';
 				}
 				$query_object->set_order_by_sql(" ORDER BY ".$this->_deduce_column_name_from_query_param($query_params['order_by']).SP.$order);
@@ -2356,46 +2356,46 @@ 
 		}
 
 		//if 'order_by' wasn't set, maybe they are just using 'order' on its own?
-		if( ! array_key_exists('order_by',$query_params) && array_key_exists('order',$query_params) && ! empty( $query_params['order'] )){
+		if ( ! array_key_exists('order_by', $query_params) && array_key_exists('order', $query_params) && ! empty($query_params['order'])) {
 			$pk_field = $this->get_primary_key_field();
 			$order = $this->_extract_order($query_params['order']);
 			$query_object->set_order_by_sql(" ORDER BY ".$pk_field->get_qualified_column().SP.$order);
 		}
 
 		//set group by
-		if(array_key_exists('group_by',$query_params)){
-			if(is_array($query_params['group_by'])){
+		if (array_key_exists('group_by', $query_params)) {
+			if (is_array($query_params['group_by'])) {
 				//it's an array, so assume we'll be grouping by a bunch of stuff
 				$group_by_array = array();
-				foreach($query_params['group_by'] as $field_name_to_group_by){
+				foreach ($query_params['group_by'] as $field_name_to_group_by) {
 					$group_by_array[] = $this->_deduce_column_name_from_query_param($field_name_to_group_by);
 				}
-				$query_object->set_group_by_sql(" GROUP BY ".implode(", ",$group_by_array));
-			}elseif( ! empty ( $query_params['group_by'] )){
+				$query_object->set_group_by_sql(" GROUP BY ".implode(", ", $group_by_array));
+			}elseif ( ! empty ($query_params['group_by'])) {
 				$query_object->set_group_by_sql(" GROUP BY ".$this->_deduce_column_name_from_query_param($query_params['group_by']));
 			}
 		}
 		//set having
-		if(array_key_exists('having',$query_params) && $query_params['having']){
-			$query_object->set_having_sql( $this->_construct_having_clause($query_params['having']));
+		if (array_key_exists('having', $query_params) && $query_params['having']) {
+			$query_object->set_having_sql($this->_construct_having_clause($query_params['having']));
 		}
 
 		//now, just verify they didn't pass anything wack
-		foreach($query_params as $query_key => $query_value){
-			if( ! in_array($query_key,$this->_allowed_query_params,true)){
+		foreach ($query_params as $query_key => $query_value) {
+			if ( ! in_array($query_key, $this->_allowed_query_params, true)) {
 				throw new EE_Error(
 					sprintf(
-						__("You passed %s as a query parameter to %s, which is illegal! The allowed query parameters are %s",'event_espresso'),
+						__("You passed %s as a query parameter to %s, which is illegal! The allowed query parameters are %s", 'event_espresso'),
 						$query_key,
 						get_class($this),
 //						print_r( $this->_allowed_query_params, TRUE )
-						implode( ',', $this->_allowed_query_params )
+						implode(',', $this->_allowed_query_params)
 					)
 				);
 			}
 		}
 		$main_model_join_sql = $query_object->get_main_model_join_sql();
-		if ( empty( $main_model_join_sql ) )
+		if (empty($main_model_join_sql))
 			$query_object->set_main_model_join_sql($this->_construct_internal_join());
 		return $query_object;
 	}
@@ -2406,17 +2406,17 @@ 
 	 * @param string $context one of EEM_Base::valid_cap_contexts()
 	 * @return array like EEM_Base::get_all() 's $query_params[0]
 	 */
-	public function caps_where_conditions( $context = self::caps_read ) {
-		EEM_Base::verify_is_valid_cap_context( $context );
+	public function caps_where_conditions($context = self::caps_read) {
+		EEM_Base::verify_is_valid_cap_context($context);
 		$cap_where_conditions = array();
-		$cap_restrictions = $this->caps_missing( $context );
+		$cap_restrictions = $this->caps_missing($context);
 		/**
 		 * @var $cap_restrictions EE_Default_Where_Conditions[]
 		 */
-		foreach( $cap_restrictions as $cap => $restriction_if_no_cap ) {
-				$cap_where_conditions = array_replace_recursive( $cap_where_conditions, $restriction_if_no_cap->get_default_where_conditions() );
+		foreach ($cap_restrictions as $cap => $restriction_if_no_cap) {
+				$cap_where_conditions = array_replace_recursive($cap_where_conditions, $restriction_if_no_cap->get_default_where_conditions());
 		}
-		return apply_filters( 'FHEE__EEM_Base__caps_where_conditions__return', $cap_where_conditions, $this, $context, $cap_restrictions );
+		return apply_filters('FHEE__EEM_Base__caps_where_conditions__return', $cap_where_conditions, $this, $context, $cap_restrictions);
 	}
 
 	/**
@@ -2426,11 +2426,11 @@ 
 	 * @return string either ASC, asc, DESC or desc
 	 * @throws EE_Error
 	 */
-	private function _extract_order($should_be_order_string){
-		if(in_array($should_be_order_string, $this->_allowed_order_values)){
+	private function _extract_order($should_be_order_string) {
+		if (in_array($should_be_order_string, $this->_allowed_order_values)) {
 			return $should_be_order_string;
-		}else{
-			throw new EE_Error(sprintf(__("While performing a query on '%s', tried to use '%s' as an order parameter. ", "event_espresso"),get_class($this),$should_be_order_string));
+		} else {
+			throw new EE_Error(sprintf(__("While performing a query on '%s', tried to use '%s' as an order parameter. ", "event_espresso"), get_class($this), $should_be_order_string));
 		}
 	}
 
@@ -2448,19 +2448,19 @@ 
 	 * @throws EE_Error
 	 * @return array like $query_params[0], see EEM_Base::get_all for documentation
 	 */
-	private function _get_default_where_conditions_for_models_in_query(EE_Model_Query_Info_Carrier $query_info_carrier,$use_default_where_conditions = 'all',$where_query_params = array()){
-		$allowed_used_default_where_conditions_values = array('all','this_model_only', 'other_models_only','none');
-		if( ! in_array($use_default_where_conditions,$allowed_used_default_where_conditions_values)){
-			throw new EE_Error(sprintf(__("You passed an invalid value to the query parameter 'default_where_conditions' of '%s'. Allowed values are %s", "event_espresso"),$use_default_where_conditions,implode(", ",$allowed_used_default_where_conditions_values)));
+	private function _get_default_where_conditions_for_models_in_query(EE_Model_Query_Info_Carrier $query_info_carrier, $use_default_where_conditions = 'all', $where_query_params = array()) {
+		$allowed_used_default_where_conditions_values = array('all', 'this_model_only', 'other_models_only', 'none');
+		if ( ! in_array($use_default_where_conditions, $allowed_used_default_where_conditions_values)) {
+			throw new EE_Error(sprintf(__("You passed an invalid value to the query parameter 'default_where_conditions' of '%s'. Allowed values are %s", "event_espresso"), $use_default_where_conditions, implode(", ", $allowed_used_default_where_conditions_values)));
 		}
-		if( in_array($use_default_where_conditions, array('all','this_model_only')) ){
+		if (in_array($use_default_where_conditions, array('all', 'this_model_only'))) {
 			$universal_query_params = $this->_get_default_where_conditions();
-		}else{
+		} else {
 			$universal_query_params = array();
 		}
 
-		if(in_array($use_default_where_conditions,array('all','other_models_only'))){
-			foreach($query_info_carrier->get_model_names_included() as $model_relation_path => $model_name){
+		if (in_array($use_default_where_conditions, array('all', 'other_models_only'))) {
+			foreach ($query_info_carrier->get_model_names_included() as $model_relation_path => $model_name) {
 				$related_model = $this->get_related_model_obj($model_name);
 				$related_model_universal_where_params = $related_model->_get_default_where_conditions($model_relation_path);
 
@@ -2487,22 +2487,22 @@ 
 	 * @param string $model_relation_path like 'Transaction.Payment.'
 	 * @return array like EEM_Base::get_all's $query_params[0]
 	 */
-	private function _override_defaults_or_make_null_friendly($default_where_conditions,$provided_where_conditions,$model,$model_relation_path){
+	private function _override_defaults_or_make_null_friendly($default_where_conditions, $provided_where_conditions, $model, $model_relation_path) {
 		$null_friendly_where_conditions = array();
 		$none_overridden = true;
 		$or_condition_key_for_defaults = 'OR*'.get_class($model);
 
-		foreach($default_where_conditions as $key => $val){
-			if( isset($provided_where_conditions[$key])){
+		foreach ($default_where_conditions as $key => $val) {
+			if (isset($provided_where_conditions[$key])) {
 				$none_overridden = false;
-			}else{
+			} else {
 				$null_friendly_where_conditions[$or_condition_key_for_defaults]['AND'][$key] = $val;
 			}
 		}
-		if( $none_overridden && $default_where_conditions){
-			if($model->has_primary_key_field()){
+		if ($none_overridden && $default_where_conditions) {
+			if ($model->has_primary_key_field()) {
 				$null_friendly_where_conditions[$or_condition_key_for_defaults][$model_relation_path.".".$model->primary_key_name()] = array('IS NULL');
-			}else{
+			} else {
 				//@todo NO PK, use other defaults
 			}
 		}
@@ -2517,8 +2517,8 @@ 
 	 * @param string $model_relation_path eg, path from Event to Payment is "Registration.Transaction.Payment."
 	 * @return array like EEM_Base::get_all's $query_params[0] (where conditions)
 	 */
-	private function _get_default_where_conditions($model_relation_path = null){
-		if ( $this->_ignore_where_strategy )
+	private function _get_default_where_conditions($model_relation_path = null) {
+		if ($this->_ignore_where_strategy)
 			return array();
 
 		return $this->_default_where_conditions_strategy->get_default_where_conditions($model_relation_path);
@@ -2529,13 +2529,13 @@ 
 	 * @param EE_Model_Query_Info_Carrier $model_query_info
 	 * @return string
 	 */
-	private function _construct_default_select_sql(EE_Model_Query_Info_Carrier $model_query_info){
+	private function _construct_default_select_sql(EE_Model_Query_Info_Carrier $model_query_info) {
 		$selects = $this->_get_columns_to_select_for_this_model();
-		foreach($model_query_info->get_model_names_included() as $model_relation_chain => $name_of_other_model_included){
+		foreach ($model_query_info->get_model_names_included() as $model_relation_chain => $name_of_other_model_included) {
 			$other_model_included = $this->get_related_model_obj($name_of_other_model_included);
 			$selects = array_merge($selects, $other_model_included->_get_columns_to_select_for_this_model($model_relation_chain));
 		}
-		return implode(", ",$selects);
+		return implode(", ", $selects);
 	}
 
 	/**
@@ -2544,19 +2544,19 @@ 
 	 * @param string $model_relation_chain like 'Question.Question_Group.Event'
 	 * @return array numerically indexed, values are columns to select and rename, eg "Event.ID AS 'Event.ID'"
 	 */
-	public function _get_columns_to_select_for_this_model($model_relation_chain = ''){
+	public function _get_columns_to_select_for_this_model($model_relation_chain = '') {
 		$fields = $this->field_settings();
 		$selects = array();
 		$table_alias_with_model_relation_chain_prefix = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix($model_relation_chain, $this->get_this_model_name());
-		foreach($fields as $field_obj){
-			$selects[] = $table_alias_with_model_relation_chain_prefix . $field_obj->get_table_alias().".".$field_obj->get_table_column()." AS '".$table_alias_with_model_relation_chain_prefix.$field_obj->get_table_alias().".".$field_obj->get_table_column()."'";
+		foreach ($fields as $field_obj) {
+			$selects[] = $table_alias_with_model_relation_chain_prefix.$field_obj->get_table_alias().".".$field_obj->get_table_column()." AS '".$table_alias_with_model_relation_chain_prefix.$field_obj->get_table_alias().".".$field_obj->get_table_column()."'";
 		}
 		//make sure we are also getting the PKs of each table
 		$tables = $this->get_tables();
-		if(count($tables) > 1){
-			foreach($tables as $table_obj){
-				$qualified_pk_column = $table_alias_with_model_relation_chain_prefix . $table_obj->get_fully_qualified_pk_column();
-				if( ! in_array($qualified_pk_column,$selects)){
+		if (count($tables) > 1) {
+			foreach ($tables as $table_obj) {
+				$qualified_pk_column = $table_alias_with_model_relation_chain_prefix.$table_obj->get_fully_qualified_pk_column();
+				if ( ! in_array($qualified_pk_column, $selects)) {
 					$selects[] = "$qualified_pk_column AS '$qualified_pk_column'";
 				}
 			}
@@ -2580,65 +2580,65 @@ 
 	 * @throws EE_Error
 	 * @return void only modifies the EEM_Related_Model_Info_Carrier passed into it
 	 */
-	private function _extract_related_model_info_from_query_param( $query_param, EE_Model_Query_Info_Carrier $passed_in_query_info, $query_param_type, $original_query_param = NULL ){
-		if($original_query_param == NULL){
+	private function _extract_related_model_info_from_query_param($query_param, EE_Model_Query_Info_Carrier $passed_in_query_info, $query_param_type, $original_query_param = NULL) {
+		if ($original_query_param == NULL) {
 			$original_query_param = $query_param;
 		}
 		$query_param = $this->_remove_stars_and_anything_after_from_condition_query_param_key($query_param);
 		/** @var $allow_logic_query_params bool whether or not to allow logic_query_params like 'NOT','OR', or 'AND' */
-		$allow_logic_query_params = in_array($query_param_type,array('where','having'));
-		$allow_fields = in_array($query_param_type,array('where','having','order_by','group_by','order'));
+		$allow_logic_query_params = in_array($query_param_type, array('where', 'having'));
+		$allow_fields = in_array($query_param_type, array('where', 'having', 'order_by', 'group_by', 'order'));
 		//check to see if we have a field on this model
 		$this_model_fields = $this->field_settings(true);
-		if(array_key_exists($query_param,$this_model_fields)){
-			if($allow_fields){
+		if (array_key_exists($query_param, $this_model_fields)) {
+			if ($allow_fields) {
 				return;
-			}else{
+			} else {
 				throw new EE_Error(sprintf(__("Using a field name (%s) on model %s is not allowed on this query param type '%s'. Original query param was %s", "event_espresso"),
-						$query_param,get_class($this),$query_param_type,$original_query_param));
+						$query_param, get_class($this), $query_param_type, $original_query_param));
 			}
 		}
 		//check if this is a special logic query param
-		elseif(in_array($query_param, $this->_logic_query_param_keys, TRUE)){
-			if($allow_logic_query_params){
+		elseif (in_array($query_param, $this->_logic_query_param_keys, TRUE)) {
+			if ($allow_logic_query_params) {
 				return;
-			}else{
+			} else {
 				throw new EE_Error(
 					sprintf(
-						__( 'Logic query params ("%1$s") are being used incorrectly with the following query param ("%2$s") on model %3$s. %4$sAdditional Info:%4$s%5$s', 'event_espresso' ),
-						implode( '", "', $this->_logic_query_param_keys ),
-						$query_param ,
-						get_class( $this ),
+						__('Logic query params ("%1$s") are being used incorrectly with the following query param ("%2$s") on model %3$s. %4$sAdditional Info:%4$s%5$s', 'event_espresso'),
+						implode('", "', $this->_logic_query_param_keys),
+						$query_param,
+						get_class($this),
 						'<br />',
-						"\t" . ' $passed_in_query_info = <pre>' . print_r( $passed_in_query_info, TRUE ) . '</pre>' . "\n\t" . ' $query_param_type = ' . $query_param_type . "\n\t" . ' $original_query_param = ' . $original_query_param
+						"\t".' $passed_in_query_info = <pre>'.print_r($passed_in_query_info, TRUE).'</pre>'."\n\t".' $query_param_type = '.$query_param_type."\n\t".' $original_query_param = '.$original_query_param
 					)
 				);
 			}
 		}
 		//check if it's a custom selection
-		elseif(array_key_exists($query_param,$this->_custom_selections)){
+		elseif (array_key_exists($query_param, $this->_custom_selections)) {
 			return;
 		}
 
 		//check if has a model name at the beginning
 		//and
 		//check if it's a field on a related model
-		foreach($this->_model_relations as $valid_related_model_name=>$relation_obj){
-			if(strpos($query_param, $valid_related_model_name.".") === 0){
-				$this->_add_join_to_model($valid_related_model_name, $passed_in_query_info,$original_query_param);
+		foreach ($this->_model_relations as $valid_related_model_name=>$relation_obj) {
+			if (strpos($query_param, $valid_related_model_name.".") === 0) {
+				$this->_add_join_to_model($valid_related_model_name, $passed_in_query_info, $original_query_param);
 				$query_param = substr($query_param, strlen($valid_related_model_name."."));
-				if($query_param == ''){
+				if ($query_param == '') {
 					//nothing left to $query_param
 					//we should actually end in a field name, not a model like this!
 					throw new EE_Error(sprintf(__("Query param '%s' (of type %s on model %s) shouldn't end on a period (.) ", "event_espresso"),
-					$query_param,$query_param_type,get_class($this),$valid_related_model_name));
-				}else{
+					$query_param, $query_param_type, get_class($this), $valid_related_model_name));
+				} else {
 					$related_model_obj = $this->get_related_model_obj($valid_related_model_name);
 					$related_model_obj->_extract_related_model_info_from_query_param($query_param, $passed_in_query_info, $query_param_type, $original_query_param);
 					return;
 				}
-			}elseif($query_param == $valid_related_model_name){
-				$this->_add_join_to_model($valid_related_model_name, $passed_in_query_info,$original_query_param);
+			}elseif ($query_param == $valid_related_model_name) {
+				$this->_add_join_to_model($valid_related_model_name, $passed_in_query_info, $original_query_param);
 				return;
 			}
 		}
@@ -2648,7 +2648,7 @@ 
 		//and we previously confirmed it wasn't a logic query param or field on the current model
 		//it's wack, that's what it is
 		throw new EE_Error(sprintf(__("There is no model named '%s' related to %s. Query param type is %s and original query param is %s", "event_espresso"),
-				$query_param,get_class($this),$query_param_type,$original_query_param));
+				$query_param, get_class($this), $query_param_type, $original_query_param));
 
 	}
 
@@ -2665,26 +2665,26 @@ 
 	 * what models to prepend onto its default query params or in case it wants to rename tables (in case there are multiple joins to the same table)
 	 * @return void
 	 */
-	private function _add_join_to_model($model_name, EE_Model_Query_Info_Carrier $passed_in_query_info,$original_query_param){
+	private function _add_join_to_model($model_name, EE_Model_Query_Info_Carrier $passed_in_query_info, $original_query_param) {
 		$relation_obj = $this->related_settings_for($model_name);
 
 		$model_relation_chain = EE_Model_Parser::extract_model_relation_chain($model_name, $original_query_param);
 		//check if the relation is HABTM, because then we're essentially doing two joins
 		//If so, join first to the JOIN table, and add its data types, and then continue as normal
-		if($relation_obj instanceof EE_HABTM_Relation){
+		if ($relation_obj instanceof EE_HABTM_Relation) {
 			$join_model_obj = $relation_obj->get_join_model();
 			//replace the model specified with the join model for this relation chain, whi
 			$relation_chain_to_join_model = EE_Model_Parser::replace_model_name_with_join_model_name_in_model_relation_chain($model_name, $join_model_obj->get_this_model_name(), $model_relation_chain);
 			$new_query_info = new EE_Model_Query_Info_Carrier(
 					array($relation_chain_to_join_model => $join_model_obj->get_this_model_name()),
 					$relation_obj->get_join_to_intermediate_model_statement($relation_chain_to_join_model));
-			$passed_in_query_info->merge( $new_query_info  );
+			$passed_in_query_info->merge($new_query_info);
 		}
 		//now just join to the other table pointed to by the relation object, and add its data types
 		$new_query_info = new EE_Model_Query_Info_Carrier(
 				array($model_relation_chain=>$model_name),
 				$relation_obj->get_join_statement($model_relation_chain));
-		$passed_in_query_info->merge( $new_query_info  );
+		$passed_in_query_info->merge($new_query_info);
 	}
 
 
@@ -2693,11 +2693,11 @@ 
 	 * @param array $where_params like EEM_Base::get_all
 	 * @return string of SQL
 	 */
-	private function _construct_where_clause($where_params){
+	private function _construct_where_clause($where_params) {
 		$SQL = $this->_construct_condition_clause_recursive($where_params, ' AND ');
-		if($SQL){
-			return " WHERE ". $SQL;
-		}else{
+		if ($SQL) {
+			return " WHERE ".$SQL;
+		} else {
 			return '';
 		}
 	}
@@ -2708,11 +2708,11 @@ 
 	 * @param array $having_params
 	 * @return string
 	 */
-	private function _construct_having_clause($having_params){
+	private function _construct_having_clause($having_params) {
 		$SQL = $this->_construct_condition_clause_recursive($having_params, ' AND ');
-		if($SQL){
-			return " HAVING ". $SQL;
-		}else{
+		if ($SQL) {
+			return " HAVING ".$SQL;
+		} else {
 			return '';
 		}
 
@@ -2726,17 +2726,17 @@ 
 	 * @return EE_Model_Field_Base
 	 * @throws EE_Error
 	 */
-	protected function _get_field_on_model($field_name,$model_name){
+	protected function _get_field_on_model($field_name, $model_name) {
 		$model_class = 'EEM_'.$model_name;
 		$model_filepath = $model_class.".model.php";
-		EE_Registry::instance()->load_helper( 'File' );
-		if ( is_readable($model_filepath)){
+		EE_Registry::instance()->load_helper('File');
+		if (is_readable($model_filepath)) {
 			require_once($model_filepath);
-			$model_instance=call_user_func($model_name."::instance");
+			$model_instance = call_user_func($model_name."::instance");
 			/* @var $model_instance EEM_Base */
 			return $model_instance->field_settings_for($field_name);
-		}else{
-			throw new EE_Error(sprintf(__('No model named %s exists, with classname %s and filepath %s','event_espresso'),$model_name,$model_class,$model_filepath));
+		} else {
+			throw new EE_Error(sprintf(__('No model named %s exists, with classname %s and filepath %s', 'event_espresso'), $model_name, $model_class, $model_filepath));
 		}
 	}
 
@@ -2749,43 +2749,43 @@ 
 	 * @throws EE_Error
 	 * @return string of SQL
 	 */
-	private function _construct_condition_clause_recursive($where_params, $glue = ' AND'){
-		$where_clauses=array();
-		foreach($where_params as $query_param => $op_and_value_or_sub_condition){
-			$query_param = $this->_remove_stars_and_anything_after_from_condition_query_param_key($query_param);//str_replace("*",'',$query_param);
-			if(in_array($query_param,$this->_logic_query_param_keys)){
-				switch($query_param){
+	private function _construct_condition_clause_recursive($where_params, $glue = ' AND') {
+		$where_clauses = array();
+		foreach ($where_params as $query_param => $op_and_value_or_sub_condition) {
+			$query_param = $this->_remove_stars_and_anything_after_from_condition_query_param_key($query_param); //str_replace("*",'',$query_param);
+			if (in_array($query_param, $this->_logic_query_param_keys)) {
+				switch ($query_param) {
 					case 'not':
 					case 'NOT':
-						$where_clauses[] = "! (". $this->_construct_condition_clause_recursive($op_and_value_or_sub_condition, $glue).")";
+						$where_clauses[] = "! (".$this->_construct_condition_clause_recursive($op_and_value_or_sub_condition, $glue).")";
 						break;
 					case 'and':
 					case 'AND':
-						$where_clauses[] = " (". $this->_construct_condition_clause_recursive($op_and_value_or_sub_condition, ' AND ') .")";
+						$where_clauses[] = " (".$this->_construct_condition_clause_recursive($op_and_value_or_sub_condition, ' AND ').")";
 						break;
 					case 'or':
 					case 'OR':
-						$where_clauses[] = " (". $this->_construct_condition_clause_recursive($op_and_value_or_sub_condition, ' OR ') .")";
+						$where_clauses[] = " (".$this->_construct_condition_clause_recursive($op_and_value_or_sub_condition, ' OR ').")";
 						break;
 				}
-			}else{
+			} else {
 				$field_obj = $this->_deduce_field_from_query_param($query_param);
 
 				//if it's not a normal field, maybe it's a custom selection?
-				if( ! $field_obj){
-					if(isset( $this->_custom_selections[$query_param][1])){
+				if ( ! $field_obj) {
+					if (isset($this->_custom_selections[$query_param][1])) {
 						$field_obj = $this->_custom_selections[$query_param][1];
-					}else{
-						throw new EE_Error(sprintf(__("%s is neither a valid model field name, nor a custom selection", "event_espresso"),$query_param));
+					} else {
+						throw new EE_Error(sprintf(__("%s is neither a valid model field name, nor a custom selection", "event_espresso"), $query_param));
 					}
 				}
 				$op_and_value_sql = $this->_construct_op_and_value($op_and_value_or_sub_condition, $field_obj);
-				$where_clauses[]=$this->_deduce_column_name_from_query_param($query_param).SP.$op_and_value_sql;
+				$where_clauses[] = $this->_deduce_column_name_from_query_param($query_param).SP.$op_and_value_sql;
 			}
 		}
-		if($where_clauses){
-			$SQL = implode($glue,$where_clauses);
-		}else{
+		if ($where_clauses) {
+			$SQL = implode($glue, $where_clauses);
+		} else {
 			$SQL = '';
 		}
 		return $SQL;
@@ -2799,18 +2799,18 @@ 
 	 * @throws EE_Error
 	 * @return string table alias and column name for SQL, eg "Transaction.TXN_ID"
 	 */
-	private function _deduce_column_name_from_query_param($query_param){
+	private function _deduce_column_name_from_query_param($query_param) {
 		$field = $this->_deduce_field_from_query_param($query_param);
 
-		if( $field ){
-			$table_alias_prefix = EE_Model_Parser::extract_table_alias_model_relation_chain_from_query_param( $field->get_model_name(), $query_param );
-			return $table_alias_prefix . $field->get_qualified_column();
-		}elseif(array_key_exists($query_param,$this->_custom_selections)){
+		if ($field) {
+			$table_alias_prefix = EE_Model_Parser::extract_table_alias_model_relation_chain_from_query_param($field->get_model_name(), $query_param);
+			return $table_alias_prefix.$field->get_qualified_column();
+		}elseif (array_key_exists($query_param, $this->_custom_selections)) {
 			//maybe it's custom selection item?
 			//if so, just use it as the "column name"
 			return $query_param;
-		}else{
-			throw new EE_Error(sprintf(__("%s is not a valid field on this model, nor a custom selection (%s)", "event_espresso"),$query_param,implode(",",$this->_custom_selections)));
+		} else {
+			throw new EE_Error(sprintf(__("%s is not a valid field on this model, nor a custom selection (%s)", "event_espresso"), $query_param, implode(",", $this->_custom_selections)));
 		}
 	}
 
@@ -2822,11 +2822,11 @@ 
 	 * @param string $condition_query_param_key
 	 * @return string
 	 */
-	private function _remove_stars_and_anything_after_from_condition_query_param_key($condition_query_param_key){
+	private function _remove_stars_and_anything_after_from_condition_query_param_key($condition_query_param_key) {
 		$pos_of_star = strpos($condition_query_param_key, '*');
-		if($pos_of_star === FALSE){
+		if ($pos_of_star === FALSE) {
 			return $condition_query_param_key;
-		}else{
+		} else {
 			$condition_query_param_sans_star = substr($condition_query_param_key, 0, $pos_of_star);
 			return $condition_query_param_sans_star;
 		}
@@ -2841,54 +2841,54 @@ 
 	 * @throws EE_Error
 	 * @return string
 	 */
-	private function _construct_op_and_value($op_and_value, $field_obj){
-		if(is_array( $op_and_value )){
+	private function _construct_op_and_value($op_and_value, $field_obj) {
+		if (is_array($op_and_value)) {
 			$operator = isset($op_and_value[0]) ? $this->_prepare_operator_for_sql($op_and_value[0]) : null;
-			if( ! $operator){
+			if ( ! $operator) {
 				$php_array_like_string = array();
-				foreach($op_and_value as $key => $value){
+				foreach ($op_and_value as $key => $value) {
 					$php_array_like_string[] = "$key=>$value";
 				}
-				throw new EE_Error(sprintf(__("You setup a query parameter like you were going to specify an operator, but didn't. You provided '(%s)', but the operator should be at array key index 0 (eg array('>',32))", "event_espresso"), implode(",",$php_array_like_string)));
+				throw new EE_Error(sprintf(__("You setup a query parameter like you were going to specify an operator, but didn't. You provided '(%s)', but the operator should be at array key index 0 (eg array('>',32))", "event_espresso"), implode(",", $php_array_like_string)));
 			}
 			$value = isset($op_and_value[1]) ? $op_and_value[1] : null;
-		}else{
+		} else {
 			$operator = '=';
 			$value = $op_and_value;
 		}
 
 		//check to see if the value is actually another field
-		if(is_array($op_and_value) && isset($op_and_value[2]) && $op_and_value[2] == true){
+		if (is_array($op_and_value) && isset($op_and_value[2]) && $op_and_value[2] == true) {
 			return $operator.SP.$this->_deduce_column_name_from_query_param($value);
-		}elseif(in_array($operator, $this->_in_style_operators) && is_array($value)){
+		}elseif (in_array($operator, $this->_in_style_operators) && is_array($value)) {
 			//in this case, the value should be an array, or at least a comma-separated list
 			//it will need to handle a little differently
 			$cleaned_value = $this->_construct_in_value($value, $field_obj);
 			//note: $cleaned_value has already been run through $wpdb->prepare()
 			return $operator.SP.$cleaned_value;
-		} elseif( in_array( $operator, $this->_between_style_operators ) && is_array( $value ) ) {
+		} elseif (in_array($operator, $this->_between_style_operators) && is_array($value)) {
 			//the value should be an array with count of two.
-			if ( count($value) !== 2 )
-				throw new EE_Error( sprintf( __("The '%s' operator must be used with an array of values and there must be exactly TWO values in that array.", 'event_espresso'), "BETWEEN" ) );
-			$cleaned_value = $this->_construct_between_value( $value, $field_obj );
+			if (count($value) !== 2)
+				throw new EE_Error(sprintf(__("The '%s' operator must be used with an array of values and there must be exactly TWO values in that array.", 'event_espresso'), "BETWEEN"));
+			$cleaned_value = $this->_construct_between_value($value, $field_obj);
 			return $operator.SP.$cleaned_value;
-		} elseif( in_array( $operator, $this->_null_style_operators ) ) {
-			if($value != NULL){
-				throw new EE_Error(sprintf(__("You attempted to give a value  (%s) while using a NULL-style operator (%s). That isn't valid", "event_espresso"),$value,$operator));
+		} elseif (in_array($operator, $this->_null_style_operators)) {
+			if ($value != NULL) {
+				throw new EE_Error(sprintf(__("You attempted to give a value  (%s) while using a NULL-style operator (%s). That isn't valid", "event_espresso"), $value, $operator));
 			}
 			return $operator;
-		}elseif( $operator == 'LIKE' && ! is_array($value)){
+		}elseif ($operator == 'LIKE' && ! is_array($value)) {
 			//if the operator is 'LIKE', we want to allow percent signs (%) and not
 			//remove other junk. So just treat it as a string.
 			return $operator.SP.$this->_wpdb_prepare_using_field($value, '%s');
-		}elseif( ! in_array($operator, $this->_in_style_operators) && ! is_array($value)){
-			return $operator.SP.$this->_wpdb_prepare_using_field($value,$field_obj);
-		}elseif(in_array($operator, $this->_in_style_operators) && ! is_array($value)){
-			throw new EE_Error(sprintf(__("Operator '%s' must be used with an array of values, eg 'Registration.REG_ID' => array('%s',array(1,2,3))",'event_espresso'),$operator, $operator));
-		}elseif( ! in_array($operator, $this->_in_style_operators) && is_array($value)){
-			throw new EE_Error(sprintf(__("Operator '%s' must be used with a single value, not an array. Eg 'Registration.REG_ID => array('%s',23))",'event_espresso'),$operator,$operator));
-		}else{
-			throw new EE_Error(sprintf(__("It appears you've provided some totally invalid query parameters. Operator and value were:'%s', which isn't right at all", "event_espresso"),  http_build_query($op_and_value)));
+		}elseif ( ! in_array($operator, $this->_in_style_operators) && ! is_array($value)) {
+			return $operator.SP.$this->_wpdb_prepare_using_field($value, $field_obj);
+		}elseif (in_array($operator, $this->_in_style_operators) && ! is_array($value)) {
+			throw new EE_Error(sprintf(__("Operator '%s' must be used with an array of values, eg 'Registration.REG_ID' => array('%s',array(1,2,3))", 'event_espresso'), $operator, $operator));
+		}elseif ( ! in_array($operator, $this->_in_style_operators) && is_array($value)) {
+			throw new EE_Error(sprintf(__("Operator '%s' must be used with a single value, not an array. Eg 'Registration.REG_ID => array('%s',23))", 'event_espresso'), $operator, $operator));
+		} else {
+			throw new EE_Error(sprintf(__("It appears you've provided some totally invalid query parameters. Operator and value were:'%s', which isn't right at all", "event_espresso"), http_build_query($op_and_value)));
 		}
 	}
 
@@ -2900,12 +2900,12 @@ 
 	 * @param EE_Model_Field_Base|string $field_obj if string, it should be the datatype to be used when querying, eg '%s'
 	 * @return string
 	 */
-	function _construct_between_value( $values, $field_obj ) {
+	function _construct_between_value($values, $field_obj) {
 		$cleaned_values = array();
-		foreach ( $values as $value ) {
-			$cleaned_values[] = $this->_wpdb_prepare_using_field($value,$field_obj);
+		foreach ($values as $value) {
+			$cleaned_values[] = $this->_wpdb_prepare_using_field($value, $field_obj);
 		}
-		return  $cleaned_values[0] . " AND " . $cleaned_values[1];
+		return  $cleaned_values[0]." AND ".$cleaned_values[1];
 	}
 
 
@@ -2921,26 +2921,26 @@ 
 	 * @param EE_Model_Field_Base|string $field_obj if string, it should be a wpdb data type like '%s', or '%d'
 	 * @return string of SQL to follow an 'IN' or 'NOT IN' operator
 	 */
-	function _construct_in_value($values,  $field_obj){
+	function _construct_in_value($values, $field_obj) {
 		//check if the value is a CSV list
-		if(is_string($values)){
+		if (is_string($values)) {
 			//in which case, turn it into an array
-			$values = explode(",",$values);
+			$values = explode(",", $values);
 		}
 		$cleaned_values = array();
-		foreach($values as $value){
-			$cleaned_values[] = $this->_wpdb_prepare_using_field($value,$field_obj);
+		foreach ($values as $value) {
+			$cleaned_values[] = $this->_wpdb_prepare_using_field($value, $field_obj);
 		}
 		//we would just LOVE to leave $cleaned_values as an empty array, and return the value as "()",
 		//but unfortunately that's invalid SQL. So instead we return a string which we KNOW will evaluate to be the empty set
 		//which is effectively equivalent to returning "()". We don't return "(0)" because that only works for auto-incrementing columns
-		if(empty($cleaned_values)){
+		if (empty($cleaned_values)) {
 			$all_fields = $this->field_settings();
 			$a_field = array_shift($all_fields);
 			$main_table = $this->_get_main_table();
 			$cleaned_values[] = "SELECT ".$a_field->get_table_column()." FROM ".$main_table->get_table_name()." WHERE FALSE";
 		}
-		return "(".implode(",",$cleaned_values).")";
+		return "(".implode(",", $cleaned_values).")";
 	}
 
 
@@ -2952,15 +2952,15 @@ 
 	 * @throws EE_Error
 	 * @return false|null|string
 	 */
-	private function _wpdb_prepare_using_field($value,$field_obj){
+	private function _wpdb_prepare_using_field($value, $field_obj) {
 		global $wpdb;
-		if($field_obj instanceof EE_Model_Field_Base){
-			return $wpdb->prepare($field_obj->get_wpdb_data_type(),$this->_prepare_value_for_use_in_db($value, $field_obj));
-		}else{//$field_obj should really just be a data type
-			if( ! in_array($field_obj,$this->_valid_wpdb_data_types)){
-				throw new EE_Error(sprintf(__("%s is not a valid wpdb datatype. Valid ones are %s", "event_espresso"),$field_obj,implode(",",$this->_valid_wpdb_data_types)));
+		if ($field_obj instanceof EE_Model_Field_Base) {
+			return $wpdb->prepare($field_obj->get_wpdb_data_type(), $this->_prepare_value_for_use_in_db($value, $field_obj));
+		} else {//$field_obj should really just be a data type
+			if ( ! in_array($field_obj, $this->_valid_wpdb_data_types)) {
+				throw new EE_Error(sprintf(__("%s is not a valid wpdb datatype. Valid ones are %s", "event_espresso"), $field_obj, implode(",", $this->_valid_wpdb_data_types)));
 			}
-			return $wpdb->prepare($field_obj,$value);
+			return $wpdb->prepare($field_obj, $value);
 		}
 	}
 
@@ -2972,27 +2972,27 @@ 
 	 * @throws EE_Error
 	 * @return EE_Model_Field_Base
 	 */
-	protected function _deduce_field_from_query_param($query_param_name){
+	protected function _deduce_field_from_query_param($query_param_name) {
 		//ok, now proceed with deducing which part is the model's name, and which is the field's name
 		//which will help us find the database table and column
 
-		$query_param_parts = explode(".",$query_param_name);
-		if(empty($query_param_parts)){
-			throw new EE_Error(sprintf(__("_extract_column_name is empty when trying to extract column and table name from %s",'event_espresso'),$query_param_name));
+		$query_param_parts = explode(".", $query_param_name);
+		if (empty($query_param_parts)) {
+			throw new EE_Error(sprintf(__("_extract_column_name is empty when trying to extract column and table name from %s", 'event_espresso'), $query_param_name));
 		}
 		$number_of_parts = count($query_param_parts);
-		$last_query_param_part = $query_param_parts[ count($query_param_parts) - 1 ];
-		if($number_of_parts == 1){
+		$last_query_param_part = $query_param_parts[count($query_param_parts) - 1];
+		if ($number_of_parts == 1) {
 			$field_name = $last_query_param_part;
 			$model_obj = $this;
-		}else{// $number_of_parts >= 2
+		} else {// $number_of_parts >= 2
 			//the last part is the column name, and there are only 2parts. therefore...
 			$field_name = $last_query_param_part;
-			$model_obj = $this->get_related_model_obj( $query_param_parts[ $number_of_parts - 2 ]);
+			$model_obj = $this->get_related_model_obj($query_param_parts[$number_of_parts - 2]);
 		}
-		try{
+		try {
 			return $model_obj->field_settings_for($field_name);
-		}catch(EE_Error $e){
+		} catch (EE_Error $e) {
 			return null;
 		}
 	}
@@ -3006,13 +3006,13 @@ 
 	 * @throws EE_Error
 	 * @return string
 	 */
-	function _get_qualified_column_for_field($field_name){
+	function _get_qualified_column_for_field($field_name) {
 		$all_fields = $this->field_settings();
 		$field = isset($all_fields[$field_name]) ? $all_fields[$field_name] : FALSE;
-		if($field){
+		if ($field) {
 			return $field->get_qualified_column();
-		}else{
-			throw new EE_Error(sprintf(__("There is no field titled %s on model %s. Either the query trying to use it is bad, or you need to add it to the list of fields on the model.",'event_espresso'),$field_name,get_class($this)));
+		} else {
+			throw new EE_Error(sprintf(__("There is no field titled %s on model %s. Either the query trying to use it is bad, or you need to add it to the list of fields on the model.", 'event_espresso'), $field_name, get_class($this)));
 		}
 	}
 
@@ -3026,14 +3026,14 @@ 
 	 * @param  mixed|string $limit The limit for this select
 	 * @return string 				The final select join element for the query.
 	 */
-	function _construct_limit_join_select( $table_alias, $limit ) {
+	function _construct_limit_join_select($table_alias, $limit) {
 		$SQL = '';
 
-		foreach ( $this->_tables as $table_obj ) {
-			if ( $table_obj instanceof EE_Primary_Table ) {
-				$SQL .= $table_alias == $table_obj->get_table_alias() ? $table_obj->get_select_join_limit( $limit ) : SP.$table_obj->get_table_name()." AS ".$table_obj->get_table_alias().SP;
-			} elseif ( $table_obj instanceof EE_Secondary_Table ) {
-				$SQL .= $table_alias == $table_obj->get_table_alias() ? $table_obj->get_select_join_limit_join($limit) : SP . $table_obj->get_join_sql( $table_alias ).SP;
+		foreach ($this->_tables as $table_obj) {
+			if ($table_obj instanceof EE_Primary_Table) {
+				$SQL .= $table_alias == $table_obj->get_table_alias() ? $table_obj->get_select_join_limit($limit) : SP.$table_obj->get_table_name()." AS ".$table_obj->get_table_alias().SP;
+			} elseif ($table_obj instanceof EE_Secondary_Table) {
+				$SQL .= $table_alias == $table_obj->get_table_alias() ? $table_obj->get_select_join_limit_join($limit) : SP.$table_obj->get_join_sql($table_alias).SP;
 			}
 		}
 		return $SQL;
@@ -3046,7 +3046,7 @@ 
 	 * Eg "wp_post AS Event" or "wp_post AS Event INNER JOIN wp_postmeta Event_Meta ON Event.ID = Event_Meta.post_id"
 	 * @return string SQL
 	 */
-	function _construct_internal_join(){
+	function _construct_internal_join() {
 		$SQL = $this->_get_main_table()->get_table_sql();
 		$SQL .= $this->_construct_internal_join_to_table_with_alias($this->_get_main_table()->get_table_alias());
 		return $SQL;
@@ -3067,17 +3067,17 @@ 
 	 * @param string $alias_prefixed table alias to join to (this table should already be in the FROM SQL clause)
 	 * @return string
 	 */
-	function _construct_internal_join_to_table_with_alias($alias_prefixed){
+	function _construct_internal_join_to_table_with_alias($alias_prefixed) {
 		$SQL = '';
 		$alias_sans_prefix = EE_Model_Parser::remove_table_alias_model_relation_chain_prefix($alias_prefixed);
-		foreach($this->_tables as $table_obj){
-			if($table_obj instanceof EE_Secondary_Table){//table is secondary table
-				if($alias_sans_prefix == $table_obj->get_table_alias()){
+		foreach ($this->_tables as $table_obj) {
+			if ($table_obj instanceof EE_Secondary_Table) {//table is secondary table
+				if ($alias_sans_prefix == $table_obj->get_table_alias()) {
 					//so we're joining to this table, meaning the table is already in
 					//the FROM statement, BUT the primary table isn't. So we want
 					//to add the inverse join sql
 					$SQL .= $table_obj->get_inverse_join_sql($alias_prefixed);
-				}else{
+				} else {
 					//just add a regular JOIN to this table from the primary table
 					$SQL .= $table_obj->get_join_sql($alias_prefixed);
 				}
@@ -3091,9 +3091,9 @@ 
 	 * This should be a growing array of keys being table-columns (eg 'EVT_ID' and 'Event.EVT_ID'), and values being their data type (eg, '%s', '%d', etc)
 	 * @return array
 	 */
-	function _get_data_types(){
+	function _get_data_types() {
 		$data_types = array();
-		foreach(array_values($this->field_settings()) as $field_obj){
+		foreach (array_values($this->field_settings()) as $field_obj) {
 			//$data_types[$field_obj->get_table_column()] = $field_obj->get_wpdb_data_type();
 			/** @var $field_obj EE_Model_Field_Base */
 			$data_types[$field_obj->get_qualified_column()] = $field_obj->get_wpdb_data_type();
@@ -3109,11 +3109,11 @@ 
 	 * @throws EE_Error
 	 * @return EEM_Base
 	 */
-	function get_related_model_obj($model_name){
+	function get_related_model_obj($model_name) {
 
 		$model_classname = "EEM_".$model_name;
-		if(!class_exists($model_classname)){
-			throw new EE_Error(sprintf(__("You specified a related model named %s in your query. No such model exists, if it did, it would have the classname %s",'event_espresso'),$model_name,$model_classname));
+		if ( ! class_exists($model_classname)) {
+			throw new EE_Error(sprintf(__("You specified a related model named %s in your query. No such model exists, if it did, it would have the classname %s", 'event_espresso'), $model_name, $model_classname));
 		}
 		$model_obj = call_user_func($model_classname."::instance");
 		return $model_obj;
@@ -3124,7 +3124,7 @@ 
 	 * Returns the array of EE_ModelRelations for this model.
 	 * @return EE_Model_Relation_Base[]
 	 */
-	public function relation_settings(){
+	public function relation_settings() {
 		return $this->_model_relations;
 	}
 
@@ -3134,10 +3134,10 @@ 
 	 * (Eg, without an event, datetimes have little purpose.)
 	 * @return EE_Belongs_To_Relation[]
 	 */
-	public function belongs_to_relations(){
+	public function belongs_to_relations() {
 		$belongs_to_relations = array();
-		foreach($this->relation_settings() as $model_name => $relation_obj){
-			if($relation_obj instanceof EE_Belongs_To_Relation){
+		foreach ($this->relation_settings() as $model_name => $relation_obj) {
+			if ($relation_obj instanceof EE_Belongs_To_Relation) {
 				$belongs_to_relations[$model_name] = $relation_obj;
 			}
 		}
@@ -3152,15 +3152,15 @@ 
 	 * @throws EE_Error
 	 * @return EE_Model_Relation_Base
 	 */
-	public function related_settings_for($relation_name){
-		$relatedModels=$this->relation_settings();
-		if(!array_key_exists($relation_name,$relatedModels)){
+	public function related_settings_for($relation_name) {
+		$relatedModels = $this->relation_settings();
+		if ( ! array_key_exists($relation_name, $relatedModels)) {
 			throw new EE_Error(
 				sprintf(
-					__('Cannot get %s related to %s. There is no model relation of that type. There is, however, %s...','event_espresso'),
+					__('Cannot get %s related to %s. There is no model relation of that type. There is, however, %s...', 'event_espresso'),
 					$relation_name,
 					$this->_get_class_name(),
-					implode( ', ', array_keys( $relatedModels ))
+					implode(', ', array_keys($relatedModels))
 				)
 			);
 		}
@@ -3175,10 +3175,10 @@ 
 	 * @throws EE_Error
 	 * @return EE_Model_Field_Base
 	 */
-	public function field_settings_for($fieldName){
-		$fieldSettings=$this->field_settings(true);
-		if( ! array_key_exists($fieldName,$fieldSettings)){
-			throw new EE_Error(sprintf(__("There is no field/column '%s' on '%s'",'event_espresso'),$fieldName,get_class($this)));
+	public function field_settings_for($fieldName) {
+		$fieldSettings = $this->field_settings(true);
+		if ( ! array_key_exists($fieldName, $fieldSettings)) {
+			throw new EE_Error(sprintf(__("There is no field/column '%s' on '%s'", 'event_espresso'), $fieldName, get_class($this)));
 		}
 		return $fieldSettings[$fieldName];
 	}
@@ -3188,11 +3188,11 @@ 
 	 * @param string $fieldName a key in the model's _field_settings array
 	 * @return boolean
 	 */
-	public function has_field($fieldName){
+	public function has_field($fieldName) {
 		$fieldSettings = $this->field_settings(true);
-		if( isset($fieldSettings[$fieldName])){
+		if (isset($fieldSettings[$fieldName])) {
 			return true;
-		}else{
+		} else {
 			return false;
 		}
 	}
@@ -3202,11 +3202,11 @@ 
 	 * @param string $relation_name possibly one of the keys in the relation_settings array
 	 * @return boolean
 	 */
-	public function has_relation($relation_name){
+	public function has_relation($relation_name) {
 		$relations = $this->relation_settings();
-		if(isset($relations[$relation_name])){
+		if (isset($relations[$relation_name])) {
 			return true;
-		}else{
+		} else {
 			return false;
 		}
 	}
@@ -3218,7 +3218,7 @@ 
 	 * @param $field_obj
 	 * @return EE_Model_Field_Base
 	 */
-	public function is_primary_key_field( $field_obj ){
+	public function is_primary_key_field($field_obj) {
 		return $field_obj instanceof EE_Primary_Key_Field_Base ? TRUE : FALSE;
 	}
 
@@ -3230,16 +3230,16 @@ 
 	 * @return EE_Model_Field_Base
 	 * @throws EE_Error
 	 */
-	public function get_primary_key_field(){
-		if( $this->_primary_key_field === NULL ){
-			foreach( $this->field_settings( TRUE ) as $field_obj ){
-				if( $this->is_primary_key_field( $field_obj )){
+	public function get_primary_key_field() {
+		if ($this->_primary_key_field === NULL) {
+			foreach ($this->field_settings(TRUE) as $field_obj) {
+				if ($this->is_primary_key_field($field_obj)) {
 					$this->_primary_key_field = $field_obj;
 					break;
 				}
 			}
-			if( ! $this->_primary_key_field instanceof EE_Primary_Key_Field_Base ){
-				throw new EE_Error(sprintf(__("There is no Primary Key defined on model %s",'event_espresso'),get_class($this)));
+			if ( ! $this->_primary_key_field instanceof EE_Primary_Key_Field_Base) {
+				throw new EE_Error(sprintf(__("There is no Primary Key defined on model %s", 'event_espresso'), get_class($this)));
 			}
 		}
 		return $this->_primary_key_field;
@@ -3252,12 +3252,12 @@ 
 	 * Internally does some caching.
 	 * @return boolean
 	 */
-	public function has_primary_key_field(){
-		if($this->_has_primary_key_field === null){
-			try{
+	public function has_primary_key_field() {
+		if ($this->_has_primary_key_field === null) {
+			try {
 				$this->get_primary_key_field();
 				$this->_has_primary_key_field = true;
-			}catch(EE_Error $e){
+			} catch (EE_Error $e) {
 				$this->_has_primary_key_field = false;
 			}
 		}
@@ -3271,9 +3271,9 @@ 
 	 * @param string $field_class_name class name of field that you want to find. Eg, EE_Datetime_Field, EE_Foreign_Key_Field, etc
 	 * @return EE_Model_Field_Base or null if none is found
 	 */
-	public function get_a_field_of_type($field_class_name){
-		foreach($this->field_settings() as $field){
-			if( $field instanceof $field_class_name ){
+	public function get_a_field_of_type($field_class_name) {
+		foreach ($this->field_settings() as $field) {
+			if ($field instanceof $field_class_name) {
 				return $field;
 			}
 		}
@@ -3287,21 +3287,21 @@ 
 	 * @return EE_Foreign_Key_Field_Base
 	 * @throws EE_Error
 	 */
-	public function get_foreign_key_to($model_name){
-		if( ! isset( $this->_cache_foreign_key_to_fields[ $model_name ] ) ){
-			foreach($this->field_settings() as $field){
+	public function get_foreign_key_to($model_name) {
+		if ( ! isset($this->_cache_foreign_key_to_fields[$model_name])) {
+			foreach ($this->field_settings() as $field) {
 //				if(is_subclass_of($field, 'EE_Foreign_Key_Field_Base')){
-				if( $field instanceof EE_Foreign_Key_Field_Base ){
-					if (in_array($model_name,$field->get_model_names_pointed_to() ) ) {
-						$this->_cache_foreign_key_to_fields[ $model_name ] = $field;
+				if ($field instanceof EE_Foreign_Key_Field_Base) {
+					if (in_array($model_name, $field->get_model_names_pointed_to())) {
+						$this->_cache_foreign_key_to_fields[$model_name] = $field;
 					}
 				}
 			}
-			if( ! isset( $this->_cache_foreign_key_to_fields[ $model_name ] ) ){
-				throw new EE_Error(sprintf(__("There is no foreign key field pointing to model %s on model %s",'event_espresso'),$model_name,get_class($this)));
+			if ( ! isset($this->_cache_foreign_key_to_fields[$model_name])) {
+				throw new EE_Error(sprintf(__("There is no foreign key field pointing to model %s on model %s", 'event_espresso'), $model_name, get_class($this)));
 			}
 		}
-		return $this->_cache_foreign_key_to_fields[ $model_name ];
+		return $this->_cache_foreign_key_to_fields[$model_name];
 	}
 
 
@@ -3312,7 +3312,7 @@ 
 	 * a table alias with a model chain prefix, like 'Venue__Event_Venue___Event_Meta'. Either one works
 	 * @return EE_Table_Base
 	 */
-	function get_table_for_alias($table_alias){
+	function get_table_for_alias($table_alias) {
 		$table_alias_sans_model_relation_chain_prefix = EE_Model_Parser::remove_table_alias_model_relation_chain_prefix($table_alias);
 		return $this->_tables[$table_alias_sans_model_relation_chain_prefix]->get_table_name();
 	}
@@ -3325,25 +3325,25 @@ 
 	 * @param bool $include_db_only_fields flag indicating whether or not to include the db-only fields
 	 * @return EE_Model_Field_Base[] where the keys are the field's name
 	 */
-	public function field_settings($include_db_only_fields = false){
-		if( $include_db_only_fields ){
-			if( $this->_cached_fields === NULL ){
+	public function field_settings($include_db_only_fields = false) {
+		if ($include_db_only_fields) {
+			if ($this->_cached_fields === NULL) {
 				$this->_cached_fields = array();
-				foreach($this->_fields as $fields_corresponding_to_table){
-					foreach($fields_corresponding_to_table as $field_name => $field_obj){
-						$this->_cached_fields[$field_name]=$field_obj;
+				foreach ($this->_fields as $fields_corresponding_to_table) {
+					foreach ($fields_corresponding_to_table as $field_name => $field_obj) {
+						$this->_cached_fields[$field_name] = $field_obj;
 					}
 				}
 			}
 			return $this->_cached_fields;
-		}else{
-			if( $this->_cached_fields_non_db_only === NULL ){
+		} else {
+			if ($this->_cached_fields_non_db_only === NULL) {
 				$this->_cached_fields_non_db_only = array();
-				foreach($this->_fields as $fields_corresponding_to_table){
-					foreach($fields_corresponding_to_table as $field_name => $field_obj){
+				foreach ($this->_fields as $fields_corresponding_to_table) {
+					foreach ($fields_corresponding_to_table as $field_name => $field_obj) {
 						/** @var $field_obj EE_Model_Field_Base */
-						if( ! $field_obj->is_db_only_field() ){
-							$this->_cached_fields_non_db_only[$field_name]=$field_obj;
+						if ( ! $field_obj->is_db_only_field()) {
+							$this->_cached_fields_non_db_only[$field_name] = $field_obj;
 						}
 					}
 				}
@@ -3362,40 +3362,40 @@ 
 	 * @return \EE_Base_Class[] array keys are primary keys (if there is a primary key on the model. if not, numerically indexed)
 	 * @throws \EE_Error
 	 */
-	protected function _create_objects( $rows = array() ) {
-		$array_of_objects=array();
-		if(empty($rows)){
+	protected function _create_objects($rows = array()) {
+		$array_of_objects = array();
+		if (empty($rows)) {
 			return array();
 		}
 		$count_if_model_has_no_primary_key = 0;
-		foreach ( $rows as $row ) {
-			if(empty($row)){//wp did its weird thing where it returns an array like array(0=>null), which is totally not helpful...
+		foreach ($rows as $row) {
+			if (empty($row)) {//wp did its weird thing where it returns an array like array(0=>null), which is totally not helpful...
 				return array();
 			}
-			$classInstance=$this->instantiate_class_from_array_or_object($row);
-			if( ! $classInstance ) {
-				throw new EE_Error( sprintf( __( 'Could not create instance of class %s from row %s', 'event_espresso' ), $this->get_this_model_name(), http_build_query( $row ) ) );
+			$classInstance = $this->instantiate_class_from_array_or_object($row);
+			if ( ! $classInstance) {
+				throw new EE_Error(sprintf(__('Could not create instance of class %s from row %s', 'event_espresso'), $this->get_this_model_name(), http_build_query($row)));
 			}
 			//set the timezone on the instantiated objects
-			$classInstance->set_timezone( $this->_timezone );
+			$classInstance->set_timezone($this->_timezone);
 			//make sure if there is any timezone setting present that we set the timezone for the object
-			$array_of_objects[$this->has_primary_key_field() ? $classInstance->ID() : $count_if_model_has_no_primary_key++]=$classInstance;
+			$array_of_objects[$this->has_primary_key_field() ? $classInstance->ID() : $count_if_model_has_no_primary_key++] = $classInstance;
 			//also, for all the relations of type BelongsTo, see if we can cache
 			//those related models
 			//(we could do this for other relations too, but if there are conditions
 			//that filtered out some fo the results, then we'd be caching an incomplete set
 			//so it requires a little more thought than just caching them immediately...)
-			foreach($this->_model_relations as $modelName => $relation_obj){
-				if( $relation_obj instanceof EE_Belongs_To_Relation){
+			foreach ($this->_model_relations as $modelName => $relation_obj) {
+				if ($relation_obj instanceof EE_Belongs_To_Relation) {
 					//check if this model's INFO is present. If so, cache it on the model
 					$other_model = $relation_obj->get_other_model();
 
 					$other_model_obj_maybe = $other_model->instantiate_class_from_array_or_object($row);
 
 					//if we managed to make a model object from the results, cache it on the main model object
-					if( $other_model_obj_maybe ){
+					if ($other_model_obj_maybe) {
 						//set timezone on these other model objects if they are present
-						$other_model_obj_maybe->set_timezone( $this->_timezone );
+						$other_model_obj_maybe->set_timezone($this->_timezone);
 						$classInstance->cache($modelName, $other_model_obj_maybe);
 					}
 				}
@@ -3416,12 +3416,12 @@ 
 
 		$this_model_fields_and_values = array();
 		//setup the row using default values;
-		foreach ( $this->field_settings() as $field_name => $field_obj ) {
+		foreach ($this->field_settings() as $field_name => $field_obj) {
 			$this_model_fields_and_values[$field_name] = $field_obj->get_default_value();
 		}
 
 		$className = $this->_get_class_name();
-		$classInstance = EE_Registry::instance()->load_class( $className, array( $this_model_fields_and_values ), FALSE, FALSE );
+		$classInstance = EE_Registry::instance()->load_class($className, array($this_model_fields_and_values), FALSE, FALSE);
 
 		return $classInstance;
 	}
@@ -3432,13 +3432,13 @@ 
 	 * _get_cached_acceptable_table_columns
 	 * @return EE_Model_Field_Base[]|null
 	 */
-	private function _get_cached_acceptable_table_columns(){
-		if( $this->_model_fields_sorted_by_db_col === NULL ){
-			foreach( $this->field_settings() as $field_obj ){
-				if( ! $field_obj->is_db_only_field() ){
-					$this->_model_fields_sorted_by_db_col[ $field_obj->get_qualified_column() ] = $field_obj;
+	private function _get_cached_acceptable_table_columns() {
+		if ($this->_model_fields_sorted_by_db_col === NULL) {
+			foreach ($this->field_settings() as $field_obj) {
+				if ( ! $field_obj->is_db_only_field()) {
+					$this->_model_fields_sorted_by_db_col[$field_obj->get_qualified_column()] = $field_obj;
 //					$this->_model_fields_sorted_by_db_col[ $field->get_table_column() ] = $field_obj;
-					$this->_model_fields_sorted_by_db_col[ $field_obj->get_table_column() ] = $field_obj;
+					$this->_model_fields_sorted_by_db_col[$field_obj->get_table_column()] = $field_obj;
 				}
 			}
 		}
@@ -3451,45 +3451,45 @@ 
 	 * or an stdClass where each property is the name of a column,
 	 * @return EE_Base_Class
 	 */
-	public function instantiate_class_from_array_or_object($cols_n_values){
-		if( ! is_array( $cols_n_values ) && is_object( $cols_n_values )) {
-			$cols_n_values = get_object_vars( $cols_n_values );
+	public function instantiate_class_from_array_or_object($cols_n_values) {
+		if ( ! is_array($cols_n_values) && is_object($cols_n_values)) {
+			$cols_n_values = get_object_vars($cols_n_values);
 		}
 		$primary_key = NULL;
 		//make sure the array only has keys that are fields/columns on this model
-		$this_model_fields_n_values = $this->_deduce_fields_n_values_from_cols_n_values( $cols_n_values );
-		if( $this->has_primary_key_field() && isset( $this_model_fields_n_values[ $this->primary_key_name() ] ) ){
-			$primary_key = $this_model_fields_n_values[ $this->primary_key_name() ];
+		$this_model_fields_n_values = $this->_deduce_fields_n_values_from_cols_n_values($cols_n_values);
+		if ($this->has_primary_key_field() && isset($this_model_fields_n_values[$this->primary_key_name()])) {
+			$primary_key = $this_model_fields_n_values[$this->primary_key_name()];
 		}
-		$className=$this->_get_class_name();
+		$className = $this->_get_class_name();
 
 		//check we actually found results that we can use to build our model object
 		//if not, return null
-		if( $this->has_primary_key_field()){
-			if(empty( $this_model_fields_n_values[$this->primary_key_name()] )){
+		if ($this->has_primary_key_field()) {
+			if (empty($this_model_fields_n_values[$this->primary_key_name()])) {
 				return NULL;
 			}
-		}else if($this->unique_indexes()){
+		} else if ($this->unique_indexes()) {
 			$first_column = reset($this_model_fields_n_values);
-			if(empty($first_column)){
+			if (empty($first_column)) {
 				return NULL;
 			}
 		}
 
 		// if there is no primary key or the object doesn't already exist in the entity map, then create a new instance
-		if ( $primary_key){
-			$classInstance = $this->get_from_entity_map( $primary_key );
-			if( ! $classInstance) {
-				$classInstance = EE_Registry::instance()->load_class( $className, array( $this_model_fields_n_values, $this->_timezone ), TRUE, FALSE );
+		if ($primary_key) {
+			$classInstance = $this->get_from_entity_map($primary_key);
+			if ( ! $classInstance) {
+				$classInstance = EE_Registry::instance()->load_class($className, array($this_model_fields_n_values, $this->_timezone), TRUE, FALSE);
 				// add this new object to the entity map
-				$classInstance = $this->add_to_entity_map( $classInstance );
+				$classInstance = $this->add_to_entity_map($classInstance);
 			}
-		}else{
-			$classInstance = EE_Registry::instance()->load_class( $className, array( $this_model_fields_n_values, $this->_timezone ), TRUE, FALSE );
+		} else {
+			$classInstance = EE_Registry::instance()->load_class($className, array($this_model_fields_n_values, $this->_timezone), TRUE, FALSE);
 		}
 
 			//it is entirely possible that the instantiated class object has a set timezone_string db field and has set it's internal _timezone property accordingly (see new_instance_from_db in model objects particularly EE_Event for example).  In this case, we want to make sure the model object doesn't have its timezone string overwritten by any timezone property currently set here on the model so, we intentionally override the model _timezone property with the model_object timezone property.
-		$this->set_timezone( $classInstance->get_timezone() );
+		$this->set_timezone($classInstance->get_timezone());
 		return $classInstance;
 	}
 	/**
@@ -3497,8 +3497,8 @@ 
 	 * @param int|string $id the ID of the model object
 	 * @return EE_Base_Class
 	 */
-	public function get_from_entity_map( $id ){
-		return isset( $this->_entity_map[ $id ] ) ? $this->_entity_map[ $id ] : NULL;
+	public function get_from_entity_map($id) {
+		return isset($this->_entity_map[$id]) ? $this->_entity_map[$id] : NULL;
 	}
 
 
@@ -3517,21 +3517,21 @@ 
 	 * @throws EE_Error
 	 * @return \EE_Base_Class
 	 */
-	public function add_to_entity_map( EE_Base_Class $object) {
+	public function add_to_entity_map(EE_Base_Class $object) {
 		$className = $this->_get_class_name();
-		if( ! $object instanceof $className ){
-			throw new EE_Error(sprintf(__("You tried adding a %s to a mapping of %ss", "event_espresso"),is_object( $object ) ? get_class( $object ) : $object, $className ) );
+		if ( ! $object instanceof $className) {
+			throw new EE_Error(sprintf(__("You tried adding a %s to a mapping of %ss", "event_espresso"), is_object($object) ? get_class($object) : $object, $className));
 		}
 		/** @var $object EE_Base_Class */
-		if ( ! $object->ID() ){
-			throw new EE_Error(sprintf(__("You tried storing a model object with NO ID in the %s entity mapper.", "event_espresso"),get_class($this)));
+		if ( ! $object->ID()) {
+			throw new EE_Error(sprintf(__("You tried storing a model object with NO ID in the %s entity mapper.", "event_espresso"), get_class($this)));
 		}
 		// double check it's not already there
-		$classInstance = $this->get_from_entity_map( $object->ID() );
-		if ( $classInstance ) {
+		$classInstance = $this->get_from_entity_map($object->ID());
+		if ($classInstance) {
 			return $classInstance;
 		} else {
-			$this->_entity_map[ $object->ID() ] = $object;
+			$this->_entity_map[$object->ID()] = $object;
 			return $object;
 		}
 	}
@@ -3544,8 +3544,8 @@ 
 	 * @param array $cols_n_values
 	 * @return array
 	 */
-	public function deduce_fields_n_values_from_cols_n_values( $cols_n_values ) {
-		return $this->_deduce_fields_n_values_from_cols_n_values( $cols_n_values );
+	public function deduce_fields_n_values_from_cols_n_values($cols_n_values) {
+		return $this->_deduce_fields_n_values_from_cols_n_values($cols_n_values);
 	}
 
 
@@ -3558,38 +3558,38 @@ 
 	 * @param string $cols_n_values
 	 * @return array
 	 */
-	protected function _deduce_fields_n_values_from_cols_n_values( $cols_n_values ){
+	protected function _deduce_fields_n_values_from_cols_n_values($cols_n_values) {
 		$this_model_fields_n_values = array();
-		foreach( $this->get_tables() as $table_alias => $table_obj ) {
-			$table_pk_value = $this->_get_column_value_with_table_alias_or_not($cols_n_values, $table_obj->get_fully_qualified_pk_column(), $table_obj->get_pk_column() );
+		foreach ($this->get_tables() as $table_alias => $table_obj) {
+			$table_pk_value = $this->_get_column_value_with_table_alias_or_not($cols_n_values, $table_obj->get_fully_qualified_pk_column(), $table_obj->get_pk_column());
 			//there is a primary key on this table and its not set. Use defaults for all its columns
-			if( $table_obj->get_pk_column() && $table_pk_value === NULL ){
-				foreach( $this->_get_fields_for_table( $table_alias ) as $field_name => $field_obj ) {
-					if( ! $field_obj->is_db_only_field() ){
+			if ($table_obj->get_pk_column() && $table_pk_value === NULL) {
+				foreach ($this->_get_fields_for_table($table_alias) as $field_name => $field_obj) {
+					if ( ! $field_obj->is_db_only_field()) {
 						$this_model_fields_n_values[$field_name] = $field_obj->get_default_value();
 					}
 				}
-			}else{
+			} else {
 				//the table's rows existed. Use their values
-				foreach( $this->_get_fields_for_table( $table_alias ) as $field_name => $field_obj ) {
-					if( ! $field_obj->is_db_only_field() )
-					$this_model_fields_n_values[$field_name] = $this->_get_column_value_with_table_alias_or_not($cols_n_values, $field_obj->get_qualified_column(), $field_obj->get_table_column() );
+				foreach ($this->_get_fields_for_table($table_alias) as $field_name => $field_obj) {
+					if ( ! $field_obj->is_db_only_field())
+					$this_model_fields_n_values[$field_name] = $this->_get_column_value_with_table_alias_or_not($cols_n_values, $field_obj->get_qualified_column(), $field_obj->get_table_column());
 				}
 			}
 		}
 		return $this_model_fields_n_values;
 	}
 
-	protected function _get_column_value_with_table_alias_or_not( $cols_n_values, $qualified_column, $regular_column ){
+	protected function _get_column_value_with_table_alias_or_not($cols_n_values, $qualified_column, $regular_column) {
 		//ask the field what it think it's table_name.column_name should be, and call it the "qualified column"
 		//does the field on the model relate to this column retrieved from the db?
 		//or is it a db-only field? (not relating to the model)
-		if( isset( $cols_n_values[ $qualified_column ] ) ){
-			$value = $cols_n_values[ $qualified_column ];
+		if (isset($cols_n_values[$qualified_column])) {
+			$value = $cols_n_values[$qualified_column];
 
-		}elseif( isset( $cols_n_values[ $regular_column ] ) ){
-			$value = $cols_n_values[ $regular_column ];
-		}else{
+		}elseif (isset($cols_n_values[$regular_column])) {
+			$value = $cols_n_values[$regular_column];
+		} else {
 			$value = NULL;
 		}
 
@@ -3607,23 +3607,23 @@ 
 	 * @param int|string $id
 	 * @return EE_Base_Class
 	 */
-	public function refresh_entity_map_from_db( $id ){
-		$obj_in_map = $this->get_from_entity_map( $id );
-		if( $obj_in_map ){
-			$wpdb_results = $this->_get_all_wpdb_results( array( array ( $this->get_primary_key_field()->get_name() => $id ), 'limit' => 1 ) );
-			if( $wpdb_results && is_array( $wpdb_results ) ){
-				$one_row = reset( $wpdb_results );
-				foreach( $this->_deduce_fields_n_values_from_cols_n_values($one_row ) as $field_name => $db_value ) {
-					$obj_in_map->set_from_db( $field_name, $db_value );
+	public function refresh_entity_map_from_db($id) {
+		$obj_in_map = $this->get_from_entity_map($id);
+		if ($obj_in_map) {
+			$wpdb_results = $this->_get_all_wpdb_results(array(array($this->get_primary_key_field()->get_name() => $id), 'limit' => 1));
+			if ($wpdb_results && is_array($wpdb_results)) {
+				$one_row = reset($wpdb_results);
+				foreach ($this->_deduce_fields_n_values_from_cols_n_values($one_row) as $field_name => $db_value) {
+					$obj_in_map->set_from_db($field_name, $db_value);
 				}
 				//clear the cache of related model objects
-				foreach ( $this->relation_settings() as $relation_name => $relation_obj ){
-					$obj_in_map->clear_cache($relation_name, NULL, TRUE );
+				foreach ($this->relation_settings() as $relation_name => $relation_obj) {
+					$obj_in_map->clear_cache($relation_name, NULL, TRUE);
 				}
 			}
 			return $obj_in_map;
-		}else{
-			return $this->get_one_by_ID( $id );
+		} else {
+			return $this->get_one_by_ID($id);
 		}
 	}
 
@@ -3641,24 +3641,24 @@ 
 	 * @param EE_Base_Class $replacing_model_obj
 	 * @return \EE_Base_Class
 	 */
-	public function refresh_entity_map_with( $id, $replacing_model_obj ) {
-		$obj_in_map = $this->get_from_entity_map( $id );
-		if( $obj_in_map ){
-			if( $replacing_model_obj instanceof EE_Base_Class ){
-				foreach( $replacing_model_obj->model_field_array() as $field_name => $value ) {
-					$obj_in_map->set( $field_name, $value );
+	public function refresh_entity_map_with($id, $replacing_model_obj) {
+		$obj_in_map = $this->get_from_entity_map($id);
+		if ($obj_in_map) {
+			if ($replacing_model_obj instanceof EE_Base_Class) {
+				foreach ($replacing_model_obj->model_field_array() as $field_name => $value) {
+					$obj_in_map->set($field_name, $value);
 				}
 				//make the model object in the entity map's cache match the $replacing_model_obj
-				foreach ( $this->relation_settings() as $relation_name => $relation_obj ){
-					$obj_in_map->clear_cache($relation_name, NULL, TRUE );
-					foreach( $replacing_model_obj->get_all_from_cache( $relation_name ) as $cache_id => $cached_obj ) {
-						$obj_in_map->cache( $relation_name, $cached_obj, $cache_id );
+				foreach ($this->relation_settings() as $relation_name => $relation_obj) {
+					$obj_in_map->clear_cache($relation_name, NULL, TRUE);
+					foreach ($replacing_model_obj->get_all_from_cache($relation_name) as $cache_id => $cached_obj) {
+						$obj_in_map->cache($relation_name, $cached_obj, $cache_id);
 					}
 				}
 			}
 			return $obj_in_map;
-		}else{
-			$this->add_to_entity_map( $replacing_model_obj );
+		} else {
+			$this->add_to_entity_map($replacing_model_obj);
 			return $replacing_model_obj;
 		}
 	}
@@ -3671,7 +3671,7 @@ 
 	 * require_once($this->_getClassName().".class.php");
 	 * @return string
 	 */
-	private function _get_class_name(){
+	private function _get_class_name() {
 		return "EE_".$this->get_this_model_name();
 	}
 
@@ -3684,10 +3684,10 @@ 
 	 * @param int $quantity
 	 * @return string
 	 */
-	public function item_name($quantity = 1){
-		if($quantity == 1){
+	public function item_name($quantity = 1) {
+		if ($quantity == 1) {
 			return $this->singular_item;
-		}else{
+		} else {
 			return $this->plural_item;
 		}
 	}
@@ -3716,13 +3716,13 @@ 
 	 * @throws EE_Error
 	 * @return mixed whatever the plugin which calls add_filter decides
 	 */
-	public function __call($methodName,$args){
-		$className=get_class($this);
-		$tagName="FHEE__{$className}__{$methodName}";
-		if(!has_filter($tagName)){
+	public function __call($methodName, $args) {
+		$className = get_class($this);
+		$tagName = "FHEE__{$className}__{$methodName}";
+		if ( ! has_filter($tagName)) {
 			throw new EE_Error(
 				sprintf(
-					__( 'Method %1$s on model %2$s does not exist! You can create one with the following code in functions.php or in a plugin: %4$s function my_callback(%4$s \$previousReturnValue, EEM_Base \$object\ $argsArray=NULL ){%4$s     /*function body*/%4$s      return \$whatever;%4$s }%4$s add_filter( \'%3$s\', \'my_callback\', 10, 3 );', 'event_espresso' ),
+					__('Method %1$s on model %2$s does not exist! You can create one with the following code in functions.php or in a plugin: %4$s function my_callback(%4$s \$previousReturnValue, EEM_Base \$object\ $argsArray=NULL ){%4$s     /*function body*/%4$s      return \$whatever;%4$s }%4$s add_filter( \'%3$s\', \'my_callback\', 10, 3 );', 'event_espresso'),
 					$methodName,
 					$className,
 					$tagName,
@@ -3731,7 +3731,7 @@ 
 			);
 		}
 
-		return apply_filters($tagName,null,$this,$args);
+		return apply_filters($tagName, null, $this, $args);
 	}
 
 
@@ -3744,22 +3744,22 @@ 
 	 * @throws EE_Error
 	 * @return EE_Base_Class
 	 */
-	public function ensure_is_obj( $base_class_obj_or_id, $ensure_is_in_db = FALSE ){
+	public function ensure_is_obj($base_class_obj_or_id, $ensure_is_in_db = FALSE) {
 		$className = $this->_get_class_name();
 		$primary_key_field = $this->get_primary_key_field();
-		if( $base_class_obj_or_id instanceof $className ){
+		if ($base_class_obj_or_id instanceof $className) {
 			$model_object = $base_class_obj_or_id;
-		}elseif( $primary_key_field instanceof EE_Primary_Key_Int_Field && (
-				is_int( $base_class_obj_or_id ) ||
-				is_string( $base_class_obj_or_id ) )){//assume it's an ID. either a proper integer or a string representing an integer (eg "101" instead of 101)
+		}elseif ($primary_key_field instanceof EE_Primary_Key_Int_Field && (
+				is_int($base_class_obj_or_id) ||
+				is_string($base_class_obj_or_id) )) {//assume it's an ID. either a proper integer or a string representing an integer (eg "101" instead of 101)
 			$model_object = $this->get_one_by_ID($base_class_obj_or_id);
-		}elseif( $primary_key_field instanceof EE_Primary_Key_String_Field && is_string($base_class_obj_or_id) ){
+		}elseif ($primary_key_field instanceof EE_Primary_Key_String_Field && is_string($base_class_obj_or_id)) {
 			//assume its a string representation of the object
 			$model_object = $this->get_one_by_ID($base_class_obj_or_id);
-		}else{
-			throw new EE_Error(sprintf(__("'%s' is neither an object of type %s, nor an ID! Its full value is '%s'",'event_espresso'),$base_class_obj_or_id,$this->_get_class_name(),print_r($base_class_obj_or_id,true)));
+		} else {
+			throw new EE_Error(sprintf(__("'%s' is neither an object of type %s, nor an ID! Its full value is '%s'", 'event_espresso'), $base_class_obj_or_id, $this->_get_class_name(), print_r($base_class_obj_or_id, true)));
 		}
-		if( $model_object->ID() == NULL && $ensure_is_in_db){
+		if ($model_object->ID() == NULL && $ensure_is_in_db) {
 			$model_object->save();
 		}
 		return $model_object;
@@ -3775,19 +3775,19 @@ 
 	 * @return int|string depending on the type of this model object's ID
 	 * @throws EE_Error
 	 */
-	public function ensure_is_ID($base_class_obj_or_id){
+	public function ensure_is_ID($base_class_obj_or_id) {
 		$className = $this->_get_class_name();
-		if( $base_class_obj_or_id instanceof $className ){
+		if ($base_class_obj_or_id instanceof $className) {
 			/** @var $base_class_obj_or_id EE_Base_Class */
 			$id = $base_class_obj_or_id->ID();
-		}elseif(is_int($base_class_obj_or_id)){
+		}elseif (is_int($base_class_obj_or_id)) {
 			//assume it's an ID
 			$id = $base_class_obj_or_id;
-		}elseif(is_string($base_class_obj_or_id)){
+		}elseif (is_string($base_class_obj_or_id)) {
 			//assume its a string representation of the object
 			$id = $base_class_obj_or_id;
-		}else{
-			throw new EE_Error(sprintf(__("'%s' is neither an object of type %s, nor an ID! Its full value is '%s'",'event_espresso'),$base_class_obj_or_id,$this->_get_class_name(),print_r($base_class_obj_or_id,true)));
+		} else {
+			throw new EE_Error(sprintf(__("'%s' is neither an object of type %s, nor an ID! Its full value is '%s'", 'event_espresso'), $base_class_obj_or_id, $this->_get_class_name(), print_r($base_class_obj_or_id, true)));
 		}
 		return $id;
 	}
@@ -3810,14 +3810,14 @@ 
 	 * @param int $values_already_prepared like one of the constants on EEM_Base
 	 * @return void
 	 */
-	public function assume_values_already_prepared_by_model_object($values_already_prepared = self::not_prepared_by_model_object){
+	public function assume_values_already_prepared_by_model_object($values_already_prepared = self::not_prepared_by_model_object) {
 		$this->_values_already_prepared_by_model_object = $values_already_prepared;
 	}
 	/**
 	 * Read comments for assume_values_already_prepared_by_model_object()
 	 * @return int
 	 */
-	public function get_assumption_concerning_values_already_prepared_by_model_object(){
+	public function get_assumption_concerning_values_already_prepared_by_model_object() {
 		return $this->_values_already_prepared_by_model_object;
 	}
 
@@ -3825,17 +3825,17 @@ 
 	 * Gets all the indexes on this model
 	 * @return EE_Index[]
 	 */
-	public function indexes(){
+	public function indexes() {
 		return $this->_indexes;
 	}
 	/**
 	 * Gets all the Unique Indexes on this model
 	 * @return EE_Unique_Index[]
 	 */
-	public function unique_indexes(){
+	public function unique_indexes() {
 		$unique_indexes = array();
-		foreach($this->_indexes as $name => $index){
-			if($index instanceof EE_Unique_Index){
+		foreach ($this->_indexes as $name => $index) {
+			if ($index instanceof EE_Unique_Index) {
 				$unique_indexes [$name] = $index;
 			}
 		}
@@ -3848,9 +3848,9 @@ 
 	 * on a primary index
 	 * @return EE_Model_Field_Base[]
 	 */
-	public function get_combined_primary_key_fields(){
-		foreach($this->indexes() as $index){
-			if($index instanceof EE_Primary_Key_Index){
+	public function get_combined_primary_key_fields() {
+		foreach ($this->indexes() as $index) {
+			if ($index instanceof EE_Primary_Key_Index) {
 				return $index->fields();
 			}
 		}
@@ -3863,7 +3863,7 @@ 
 	 * @param array $cols_n_values keys are field names, values are their values
 	 * @return string
 	 */
-	public function get_index_primary_key_string($cols_n_values){
+	public function get_index_primary_key_string($cols_n_values) {
 		$cols_n_values_for_primary_key_index = array_intersect_key($cols_n_values, $this->get_combined_primary_key_fields());
 		return http_build_query($cols_n_values_for_primary_key_index);
 	}
@@ -3875,13 +3875,13 @@ 
 	 * @param string $index_primary_key_string
 	 * @return null|array
 	 */
-	function parse_index_primary_key_string( $index_primary_key_string) {
+	function parse_index_primary_key_string($index_primary_key_string) {
 		$key_fields = $this->get_combined_primary_key_fields();
 		//check all of them are in the $id
 		$key_vals_in_combined_pk = array();
-		parse_str( $index_primary_key_string, $key_vals_in_combined_pk );
-		foreach( $key_fields as $key_field_name => $field_obj ) {
-			if( ! isset( $key_vals_in_combined_pk[ $key_field_name ] ) ){
+		parse_str($index_primary_key_string, $key_vals_in_combined_pk);
+		foreach ($key_fields as $key_field_name => $field_obj) {
+			if ( ! isset($key_vals_in_combined_pk[$key_field_name])) {
 				return NULL;
 			}
 		}
@@ -3894,10 +3894,10 @@ 
 	 * @param array $key_vals
 	 * @return boolean
 	 */
-	function has_all_combined_primary_key_fields( $key_vals ) {
-		$keys_it_should_have = array_keys( $this->get_combined_primary_key_fields() );
-		foreach( $keys_it_should_have as $key ){
-			if( ! isset( $key_vals[ $key ] ) ){
+	function has_all_combined_primary_key_fields($key_vals) {
+		$keys_it_should_have = array_keys($this->get_combined_primary_key_fields());
+		foreach ($keys_it_should_have as $key) {
+			if ( ! isset($key_vals[$key])) {
 				return false;
 			}
 		}
@@ -3913,23 +3913,23 @@ 
 	 * @throws EE_Error
 	 * @return \EE_Base_Class[]
 	 */
-	public function get_all_copies($model_object_or_attributes_array, $query_params = array()){
+	public function get_all_copies($model_object_or_attributes_array, $query_params = array()) {
 
-		if($model_object_or_attributes_array instanceof EE_Base_Class){
+		if ($model_object_or_attributes_array instanceof EE_Base_Class) {
 			$attributes_array = $model_object_or_attributes_array->model_field_array();
-		}elseif(is_array($model_object_or_attributes_array)){
+		}elseif (is_array($model_object_or_attributes_array)) {
 			$attributes_array = $model_object_or_attributes_array;
-		}else{
-			throw new EE_Error(sprintf(__("get_all_copies should be provided with either a model object or an array of field-value-pairs, but was given %s", "event_espresso"),$model_object_or_attributes_array));
+		} else {
+			throw new EE_Error(sprintf(__("get_all_copies should be provided with either a model object or an array of field-value-pairs, but was given %s", "event_espresso"), $model_object_or_attributes_array));
 		}
 		//even copies obviously won't have the same ID, so remove the primary key
 		//from the WHERE conditions for finding copies (if there is a primary key, of course)
-		if($this->has_primary_key_field() && isset($attributes_array[$this->primary_key_name()])){
+		if ($this->has_primary_key_field() && isset($attributes_array[$this->primary_key_name()])) {
 			unset($attributes_array[$this->primary_key_name()]);
 		}
-		if(isset($query_params[0])){
-			$query_params[0] = array_merge($attributes_array,$query_params);
-		}else{
+		if (isset($query_params[0])) {
+			$query_params[0] = array_merge($attributes_array, $query_params);
+		} else {
 			$query_params[0] = $attributes_array;
 		}
 		return $this->get_all($query_params);
@@ -3943,16 +3943,16 @@ 
 	 * @param array $query_params
 	 * @return EE_Base_Class
 	 */
-	function get_one_copy($model_object_or_attributes_array,$query_params = array()){
-		if( ! is_array( $query_params ) ){
-			EE_Error::doing_it_wrong('EEM_Base::get_one_copy', sprintf( __( '$query_params should be an array, you passed a variable of type %s', 'event_espresso' ), gettype( $query_params ) ), '4.6.0' );
+	function get_one_copy($model_object_or_attributes_array, $query_params = array()) {
+		if ( ! is_array($query_params)) {
+			EE_Error::doing_it_wrong('EEM_Base::get_one_copy', sprintf(__('$query_params should be an array, you passed a variable of type %s', 'event_espresso'), gettype($query_params)), '4.6.0');
 			$query_params = array();
 		}
 		$query_params['limit'] = 1;
-		$copies = $this->get_all_copies($model_object_or_attributes_array,$query_params);
-		if(is_array($copies)){
+		$copies = $this->get_all_copies($model_object_or_attributes_array, $query_params);
+		if (is_array($copies)) {
 			return array_shift($copies);
-		}else{
+		} else {
 			return null;
 		}
 	}
@@ -3966,10 +3966,10 @@ 
 	 * @param int|string $id the value of the primary key to update
 	 * @return int number of rows updated
 	 */
-	public function update_by_ID($fields_n_values,$id){
+	public function update_by_ID($fields_n_values, $id) {
 		$query_params = array(0=>array($this->get_primary_key_field()->get_name() => $id),
 			'default_where_conditions'=>'other_models_only',);
-		return $this->update($fields_n_values,$query_params);
+		return $this->update($fields_n_values, $query_params);
 	}
 
 
@@ -3980,12 +3980,12 @@ 
 	 * @return string an operator which can be used in SQL
 	 * @throws EE_Error
 	 */
-	private function _prepare_operator_for_sql($operator_supplied){
+	private function _prepare_operator_for_sql($operator_supplied) {
 		$sql_operator = isset($this->_valid_operators[$operator_supplied]) ? $this->_valid_operators[$operator_supplied] : null;
-		if($sql_operator){
+		if ($sql_operator) {
 			return $sql_operator;
-		}else{
-			throw new EE_Error(sprintf(__("The operator '%s' is not in the list of valid operators: %s", "event_espresso"),$operator_supplied,implode(",",array_keys($this->_valid_operators))));
+		} else {
+			throw new EE_Error(sprintf(__("The operator '%s' is not in the list of valid operators: %s", "event_espresso"), $operator_supplied, implode(",", array_keys($this->_valid_operators))));
 		}
 	}
 
@@ -3995,10 +3995,10 @@ 
 	 * @param array $query_params like get_all's
 	 * @return string[]
 	 */
-	public function get_all_names($query_params = array()){
+	public function get_all_names($query_params = array()) {
 		$objs = $this->get_all($query_params);
 		$names = array();
-		foreach($objs as $obj){
+		foreach ($objs as $obj) {
 			$names[$obj->ID()] = $obj->name();
 		}
 		return $names;
@@ -4009,8 +4009,8 @@ 
 	 * are no capabilities that relate to this model returns false
 	 * @return string|false
 	 */
-	public function cap_slug(){
-		return apply_filters( 'FHEE__EEM_Base__cap_slug', $this->_caps_slug, $this);
+	public function cap_slug() {
+		return apply_filters('FHEE__EEM_Base__cap_slug', $this->_caps_slug, $this);
 	}
 
 	/**
@@ -4022,27 +4022,27 @@ 
 	 * @param string $context
 	 * @return EE_Default_Where_Conditions[] indexed by associated capability
 	 */
-	public function cap_restrictions( $context = EEM_Base::caps_read ) {
-		EEM_Base::verify_is_valid_cap_context( $context );
+	public function cap_restrictions($context = EEM_Base::caps_read) {
+		EEM_Base::verify_is_valid_cap_context($context);
 		//check if we ought to run the restriction generator first
-		if( isset( $this->_cap_restriction_generators[ $context ] ) &&
-				$this->_cap_restriction_generators[ $context ] instanceof EE_Restriction_Generator_Base &&
-				! $this->_cap_restriction_generators[ $context ]->has_generated_cap_restrictions() ) {
-			$this->_cap_restrictions[ $context ] = array_merge( $this->_cap_restrictions[ $context ],  $this->_cap_restriction_generators[ $context ]->generate_restrictions() );
+		if (isset($this->_cap_restriction_generators[$context]) &&
+				$this->_cap_restriction_generators[$context] instanceof EE_Restriction_Generator_Base &&
+				! $this->_cap_restriction_generators[$context]->has_generated_cap_restrictions()) {
+			$this->_cap_restrictions[$context] = array_merge($this->_cap_restrictions[$context], $this->_cap_restriction_generators[$context]->generate_restrictions());
 		}
 		//and make sure we've finalized the construction of each restriction
-		foreach( $this->_cap_restrictions[ $context ] as $where_conditions_obj ) {
-			$where_conditions_obj->_finalize_construct( $this );
+		foreach ($this->_cap_restrictions[$context] as $where_conditions_obj) {
+			$where_conditions_obj->_finalize_construct($this);
 		}
 
-		return $this->_cap_restrictions[ $context ];
+		return $this->_cap_restrictions[$context];
 	}
 
 	/**
 	 * Indicating whether or not this model thinks its a wp core model
 	 * @return boolean
 	 */
-	public function is_wp_core_model(){
+	public function is_wp_core_model() {
 		return $this->_wp_core_model;
 	}
 
@@ -4052,12 +4052,12 @@ 
 	 * @param string $context one of EEM_Base::caps_ constants
 	 * @return EE_Default_Where_Conditions[] indexed by capability name
 	 */
-	public function caps_missing( $context = EEM_Base::caps_read ) {
+	public function caps_missing($context = EEM_Base::caps_read) {
 		$missing_caps = array();
-		$cap_restrictions = $this->cap_restrictions( $context );
-		foreach( $cap_restrictions as $cap => $restriction_if_no_cap ) {
-			if( ! EE_Capabilities::instance()->current_user_can( $cap, $this->get_this_model_name() . '_model_applying_caps') ) {
-				$missing_caps[ $cap ] = $restriction_if_no_cap;
+		$cap_restrictions = $this->cap_restrictions($context);
+		foreach ($cap_restrictions as $cap => $restriction_if_no_cap) {
+			if ( ! EE_Capabilities::instance()->current_user_can($cap, $this->get_this_model_name().'_model_applying_caps')) {
+				$missing_caps[$cap] = $restriction_if_no_cap;
 			}
 		}
 		return $missing_caps;
@@ -4069,7 +4069,7 @@ 
 	 * one of 'read', 'edit', or 'delete'
 	 */
 	public function cap_contexts_to_cap_action_map() {
-		return apply_filters( 'FHEE__EEM_Base__cap_contexts_to_cap_action_map', $this->_cap_contexts_to_cap_action_map, $this );
+		return apply_filters('FHEE__EEM_Base__cap_contexts_to_cap_action_map', $this->_cap_contexts_to_cap_action_map, $this);
 	}
 
 
@@ -4080,19 +4080,19 @@ 
 	 * @return string one of EEM_Base::cap_contexts_to_cap_action_map() values
 	 * @throws \EE_Error
 	 */
-	public function cap_action_for_context( $context ) {
+	public function cap_action_for_context($context) {
 		$mapping = $this->cap_contexts_to_cap_action_map();
-		if( isset( $mapping[ $context ] ) ) {
-			return $mapping[ $context ];
+		if (isset($mapping[$context])) {
+			return $mapping[$context];
 		}
-		if( $action = apply_filters( 'FHEE__EEM_Base__cap_action_for_context', null, $this, $mapping, $context ) ) {
+		if ($action = apply_filters('FHEE__EEM_Base__cap_action_for_context', null, $this, $mapping, $context)) {
 			return $action;
 		}
 		throw new EE_Error(
 			sprintf(
-				__( 'Cannot find capability restrictions for context "%1$s", allowed values are:%2$s', 'event_espresso' ),
+				__('Cannot find capability restrictions for context "%1$s", allowed values are:%2$s', 'event_espresso'),
 				$context,
-				implode(',', array_keys( $this->cap_contexts_to_cap_action_map() ) )
+				implode(',', array_keys($this->cap_contexts_to_cap_action_map()))
 			)
 		);
 
@@ -4103,7 +4103,7 @@ 
 	 * @return array
 	 */
 	static public function valid_cap_contexts() {
-		return apply_filters( 'FHEE__EEM_Base__valid_cap_contexts', array(
+		return apply_filters('FHEE__EEM_Base__valid_cap_contexts', array(
 			self::caps_read,
 			self::caps_read_admin,
 			self::caps_edit,
@@ -4119,17 +4119,17 @@ 
 	 * @return bool
 	 * @throws \EE_Error
 	 */
-	static public function verify_is_valid_cap_context( $context ) {
+	static public function verify_is_valid_cap_context($context) {
 		$valid_cap_contexts = EEM_Base::valid_cap_contexts();
-		if( in_array( $context, $valid_cap_contexts ) ) {
+		if (in_array($context, $valid_cap_contexts)) {
 			return true;
-		}else{
+		} else {
 			throw new EE_Error(
 				sprintf(
-					__( 'Context "%1$s" passed into model "%2$s" is not a valid context. They are: %3$s', 'event_espresso' ),
+					__('Context "%1$s" passed into model "%2$s" is not a valid context. They are: %3$s', 'event_espresso'),
 					$context,
-					'EEM_Base' ,
-					implode(',', $valid_cap_contexts )
+					'EEM_Base',
+					implode(',', $valid_cap_contexts)
 				)
 			);
 		}

Doc Comments +16 added lines, -13 removed lines

@@ -744,7 +744,7 @@ 
 	 * Returns the name of the field's name that points to the WP_User table
 	 *  on this model (or follows the _model_chain_to_wp_user and uses that model's
 	 * foreign key to the WP_User table)
-	 * @return string|boolean string on success, boolean false when there is no
+	 * @return string|false string on success, boolean false when there is no
 	 * foreign key to the WP_User table
 	 */
 	function wp_user_field_name() {
@@ -840,6 +840,7 @@ 
 	 * If you would like to use these custom selections in WHERE, GROUP_BY, or HAVING clauses, you must instead provide an array.
 	 * Array keys are the aliases used to refer to this selection, and values are to be numerically-indexed arrays, where 0 is the selection
 	 * and 1 is the data type. Eg, array('count'=>array('COUNT(REG_ID)','%d'))
+	 * @param string $columns_to_select
 	 * @return stdClass[] like results of $wpdb->get_results($sql,OBJECT), (ie, output type is OBJECT)
 	 */
 	public function  get_all_wpdb_results($query_params = array(), $output = ARRAY_A, $columns_to_select = null){
@@ -1333,7 +1334,7 @@ 
 	 * Deletes a single row from the DB given the model object's primary key value. (eg, EE_Attendee->ID()'s value).
 	 * Wrapper for EEM_Base::delete()
 	 * @param mixed $id
-	 * @return boolean whether the row got deleted or not
+	 * @return integer whether the row got deleted or not
 	 */
 	public function delete_by_ID( $id ){
 		return $this->delete( array(
@@ -1453,7 +1454,7 @@ 
 
 	/**
 	 * This sets up our delete where sql and accounts for if we have secondary tables that will have rows deleted as well.
-	 * @param  array  $objects_for_deletion This should be the values returned by $this->_get_all_wpdb_results()
+	 * @param  stdClass[]  $objects_for_deletion This should be the values returned by $this->_get_all_wpdb_results()
 	 * @param boolean $allow_blocking       if TRUE, matched objects will only be deleted if there is no related model info
 	 * that blocks it (ie, there' sno other data that depends on this data); if false, deletes regardless of other objects
 	 * which may depend on it. Its generally advisable to always leave this as TRUE, otherwise you could easily corrupt your DB
@@ -1666,7 +1667,6 @@ 
 	 * 'hasAndBelongsToMany' relationships: checks that there isn't already an entry in the join table, and adds one.
 	 * If one of the model Objects has not yet been saved to the database, it is saved before adding the entry in the join table
 	 *
-	 * @param EE_Base_Class/int $thisModelObject
 	 * @param EE_Base_Class/int $id_or_obj EE_base_Class or ID of other Model Object
 	 * @param string $relationName, key in EEM_Base::_relations
 	 * an attendee to a group, you also want to specify which role they will have in that group. So you would use this parameter to specify array('role-column-name'=>'role-id')
@@ -1688,8 +1688,8 @@ 
 	 *
 	 * 'hasAndBelongsToMany' relationships:removes any existing entry in the join table between the two models.
 	 *
-	 * @param EE_Base_Class/int $id_or_obj
-	 * @param EE_Base_Class/int $other_model_id_or_obj EE_Base_Class or ID of other Model Object
+	 * @param EE_CPT_Base $id_or_obj
+	 * @param EE_Term_Taxonomy $other_model_id_or_obj EE_Base_Class or ID of other Model Object
 	 * @param string $relationName key in EEM_Base::_relations
 	 * @return boolean of success
 	 * @param array   $where_query This allows you to enter further query params for the relation to for relation to methods that allow you to further specify extra columns to join by (such as HABTM).  Keep in mind that the only acceptable query_params is strict "col" => "value" pairs because these will be inserted in any new rows created as well.
@@ -1765,7 +1765,7 @@ 
 	/**
 	 * Instead of getting the related model objects, simply counts them. Ignores default_where_conditions by default,
 	 * unless otherwise specified in the $query_params
-	 * @param int/EE_Base_Class $id_or_obj
+	 * @param EE_Event $id_or_obj
 	 * @param string $model_name like 'Event', or 'Registration'
 	 * @param array $query_params like EEM_Base::get_all's
 	 * @param string $field_to_count name of field to count by. By default, uses primary key
@@ -2153,7 +2153,7 @@ 
 	/**
 	 * Finds all the fields that correspond to the given table
 	 * @param string $table_alias, array key in EEM_Base::_tables
-	 * @return EE_Model_Field_Base[]
+	 * @return EE_Model_Field_Base
 	 */
 	function _get_fields_for_table($table_alias){
 		return $this->_fields[$table_alias];
@@ -3215,8 +3215,8 @@ 
 	/**
 	 * gets the field object of type 'primary_key' from the fieldsSettings attribute.
 	 * Eg, on EE_Answer that would be ANS_ID field object
-	 * @param $field_obj
-	 * @return EE_Model_Field_Base
+	 * @param EE_Model_Field_Base $field_obj
+	 * @return boolean
 	 */
 	public function is_primary_key_field( $field_obj ){
 		return $field_obj instanceof EE_Primary_Key_Field_Base ? TRUE : FALSE;
@@ -3310,7 +3310,7 @@ 
 	 * Gets the actual table for the table alias
 	 * @param string $table_alias eg Event, Event_Meta, Registration, Transaction, but maybe
 	 * a table alias with a model chain prefix, like 'Venue__Event_Venue___Event_Meta'. Either one works
-	 * @return EE_Table_Base
+	 * @return string
 	 */
 	function get_table_for_alias($table_alias){
 		$table_alias_sans_model_relation_chain_prefix = EE_Model_Parser::remove_table_alias_model_relation_chain_prefix($table_alias);
@@ -3410,7 +3410,7 @@ 
 	 * The purpose of this method is to allow us to create a model object that is not in the db that holds default values.
 	 * A typical example of where this is used is when creating a new item and the initial load of a form.  We dont' necessarily want to test for if the object is present but just assume it is BUT load the defaults from the object (as set in the model_field!).
 	 *
-	 * @return EE_Base_Class single EE_Base_Class object with default values for the properties.
+	 * @return boolean single EE_Base_Class object with default values for the properties.
 	 */
 	public function create_default_object() {
 
@@ -3580,6 +3580,9 @@ 
 		return $this_model_fields_n_values;
 	}
 
+	/**
+	 * @param string $cols_n_values
+	 */
 	protected function _get_column_value_with_table_alias_or_not( $cols_n_values, $qualified_column, $regular_column ){
 		//ask the field what it think it's table_name.column_name should be, and call it the "qualified column"
 		//does the field on the model relate to this column retrieved from the db?
@@ -3815,7 +3818,7 @@ 
 	}
 	/**
 	 * Read comments for assume_values_already_prepared_by_model_object()
-	 * @return int
+	 * @return boolean
 	 */
 	public function get_assumption_concerning_values_already_prepared_by_model_object(){
 		return $this->_values_already_prepared_by_model_object;

Braces +129 added lines, -119 removed lines

@@ -504,7 +504,7 @@ 
 		if( isset( $this->_cap_restriction_generators[ $context ] ) &&
 				$this->_cap_restriction_generators[ $context ] instanceof EE_Restriction_Generator_Base ) {
 			return $this->_cap_restriction_generators[ $context ]->generate_restrictions();
-		}else{
+		} else{
 			return array();
 		}
 }
@@ -578,8 +578,9 @@ 
 	 * @return array
 	 */
 	 public function status_array( $translated = FALSE ) {
-	 	if ( !array_key_exists('Status', $this->_model_relations ) )
-	 		return array();
+	 	if ( !array_key_exists('Status', $this->_model_relations ) ) {
+	 		 		return array();
+	 	}
 	 	$model_name = $this->get_this_model_name();
 	 	$status_type = str_replace(' ', '_', strtolower( str_replace('_', ' ', $model_name) ) );
 	 	$stati = EEM_Status::instance()->get_all(array(array('STS_type' => $status_type) ) );
@@ -758,13 +759,13 @@ 
 				$last_model_name = end( $models_to_follow_to_wp_users );
 				$model_with_fk_to_wp_users = EE_Registry::instance()->load_model( $last_model_name );
 				$model_chain_to_wp_user = $this->_model_chain_to_wp_user . '.';
-			}else{
+			} else{
 				$model_with_fk_to_wp_users = $this;
 				$model_chain_to_wp_user = '';
 			}
 			$wp_user_field = $model_with_fk_to_wp_users->get_foreign_key_to( 'WP_User' );
 			return $model_chain_to_wp_user . $wp_user_field->get_name();
-		}catch( EE_Error $e ) {
+		} catch( EE_Error $e ) {
 			return false;
 		}
 	}
@@ -792,11 +793,11 @@ 
 	public function is_owned() {
 		if( $this->model_chain_to_wp_user() ){
 			return true;
-		}else{
+		} else{
 			try{
 				$this->get_foreign_key_to( 'WP_User' );
 				return true;
-			}catch( EE_Error $e ){
+			} catch( EE_Error $e ){
 				return false;
 			}
 		}
@@ -819,9 +820,9 @@ 
 		//remember the custom selections, if any
 		if(is_array($columns_to_select)){
 			$this->_custom_selections = $columns_to_select;
-		}elseif(is_string($columns_to_select)){
+		} elseif(is_string($columns_to_select)){
 			$this->_custom_selections = array($this->_custom_selections);
-		}else{
+		} else{
 			$this->_custom_selections = array();
 		}
 
@@ -872,7 +873,7 @@ 
 				$select_sql_array[] = "{$selection_and_datatype[0]} AS $alias";
 			}
 			$columns_to_select_string = implode(", ",$select_sql_array);
-		}else{
+		} else{
 			$columns_to_select_string = $columns_to_select;
 		}
 		return $columns_to_select_string;
@@ -900,10 +901,10 @@ 
 	function get_one_by_ID($id){
 		if( $this->get_from_entity_map( $id ) ){
 			return $this->get_from_entity_map( $id );
-		}elseif( $this->has_primary_key_field ( ) ) {
+		} elseif( $this->has_primary_key_field ( ) ) {
 			$primary_key_name = $this->get_primary_key_field()->get_name();
 			return $this->get_one(array(array($primary_key_name => $id)));
-		}else{
+		} else{
 			//no primary key, so the $id must be from the get_index_primary_key_string()
 			return $this->get_one( array( $this->parse_index_primary_key_string( $id ) ) );
 		}
@@ -925,7 +926,7 @@ 
 		$items = $this->get_all($query_params);
 		if(empty($items)){
 			return null;
-		}else{
+		} else{
 			return array_shift($items);
 		}
 	}
@@ -1177,7 +1178,7 @@ 
 				//get the model object's PK, as we'll want this if we need to insert a row into secondary tables
 				if( $this->has_primary_key_field() ){
 					$main_table_pk_value = $wpdb_result[ $this->get_primary_key_field()->get_qualified_column() ];
-				}else{
+				} else{
 					//if there's no primary key, we basically can't support having a 2nd table on the model (we could but it woudl be lots of work)
 					$main_table_pk_value = null;
 				}
@@ -1216,7 +1217,7 @@ 
 		if( $keep_model_objs_in_sync && ! $this->_values_already_prepared_by_model_object ){
 			if( $this->has_primary_key_field() ){
 				$model_objs_affected_ids = $this->get_col( $query_params );
-			}else{
+			} else{
 				//we need to select a bunch of columns and then combine them into the the "index primary key string"s
 				$models_affected_key_columns = $this->_get_all_wpdb_results($query_params, ARRAY_A );
 				$model_objs_affected_ids = array();
@@ -1276,9 +1277,9 @@ 
 
 		if( $field_to_select ){
 			$field = $this->field_settings_for( $field_to_select );
-		}elseif( $this->has_primary_key_field ( ) ){
+		} elseif( $this->has_primary_key_field ( ) ){
 			$field = $this->get_primary_key_field();
-		}else{
+		} else{
 			//no primary key, just grab the first column
 			$field = reset( $this->field_settings());
 		}
@@ -1302,7 +1303,7 @@ 
 		$col = $this->get_col( $query_params, $field_to_select );
 		if( ! empty( $col ) ) {
 			return reset( $col );
-		}else{
+		} else{
 			return NULL;
 		}
 	}
@@ -1385,7 +1386,7 @@ 
 
 			//		/echo "delete sql:$SQL";
 			$rows_deleted = $this->_do_wpdb_query( 'query', array( $SQL ) );
-		}else{
+		} else{
 			$rows_deleted = 0;
 		}
 
@@ -1427,7 +1428,7 @@ 
 		//first, if $ignore_this_model_obj was supplied, get its model
 		if($ignore_this_model_obj && $ignore_this_model_obj instanceof EE_Base_Class){
 			$ignored_model = $ignore_this_model_obj->get_model();
-		}else{
+		} else{
 			$ignored_model = null;
 		}
 		//now check all the relations of $this_model_obj_or_id and see if there
@@ -1440,7 +1441,7 @@ 
 				if($ignored_model && $relation_name == $ignored_model->get_this_model_name()){
 					$related_model_objects = $relation_obj->get_all_related($this_model_obj_or_id,array(
 					array($ignored_model->get_primary_key_field()->get_name() => array('!=',$ignore_this_model_obj->ID()))));
-				}else{
+				} else{
 					$related_model_objects = $relation_obj->get_all_related($this_model_obj_or_id);
 				}
 
@@ -1477,24 +1478,28 @@ 
 				}
 
 				//primary table deletes
-				if ( isset( $delete_object[$primary_table->get_fully_qualified_pk_column()] ) )
-					$deletes[$primary_table->get_fully_qualified_pk_column()][] = $delete_object[$primary_table->get_fully_qualified_pk_column()];
+				if ( isset( $delete_object[$primary_table->get_fully_qualified_pk_column()] ) ) {
+									$deletes[$primary_table->get_fully_qualified_pk_column()][] = $delete_object[$primary_table->get_fully_qualified_pk_column()];
+				}
 
 				//other tables
 				if ( !empty( $other_tables ) ) {
 					foreach ( $other_tables as $ot ) {
 
 						//first check if we've got the foreign key column here.
-						if ( isset( $delete_object[$ot->get_fully_qualified_fk_column()] ) )
-							$deletes[$ot->get_fully_qualified_pk_column()][] = $delete_object[$ot->get_fully_qualified_fk_column()];
+						if ( isset( $delete_object[$ot->get_fully_qualified_fk_column()] ) ) {
+													$deletes[$ot->get_fully_qualified_pk_column()][] = $delete_object[$ot->get_fully_qualified_fk_column()];
+						}
 
 						//wait! it's entirely possible that we'll have a the primary key for this table in here if it's a foreign key for one of the other secondary tables
-						if ( isset( $delete_object[$ot->get_fully_qualified_pk_column()] ) )
-							$deletes[$ot->get_fully_qualified_pk_column()][] = $delete_object[$ot->get_fully_qualified_pk_column()];
+						if ( isset( $delete_object[$ot->get_fully_qualified_pk_column()] ) ) {
+													$deletes[$ot->get_fully_qualified_pk_column()][] = $delete_object[$ot->get_fully_qualified_pk_column()];
+						}
 
 						//finally, it is possible that the fk for this table is found in the fully qualified pk column for the fk table, so let's see if that's there!
-						if ( isset( $delete_object[$ot->get_fully_qualified_pk_on_fk_table()]) )
-							$deletes[$ot->get_fully_qualified_pk_column()][] = $delete_object[$ot->get_fully_qualified_pk_column()];
+						if ( isset( $delete_object[$ot->get_fully_qualified_pk_on_fk_table()]) ) {
+													$deletes[$ot->get_fully_qualified_pk_column()][] = $delete_object[$ot->get_fully_qualified_pk_column()];
+						}
 					}
 				}
 			}
@@ -1507,7 +1512,7 @@ 
 			}
 
 			return !empty($query) ? implode(' AND ', $query ) : '';
-		}elseif(count($this->get_combined_primary_key_fields()) > 1){
+		} elseif(count($this->get_combined_primary_key_fields()) > 1){
 			$ways_to_identify_a_row = array();
 			$fields = $this->get_combined_primary_key_fields();
 			//note: because there' sno primary key, that means nothing else  can be pointing to this model, right?
@@ -1519,7 +1524,7 @@ 
 				$ways_to_identify_a_row[] = "(".implode(" AND ",$values_for_each_cpk_for_a_row).")";
 			}
 			return implode(" OR ",$ways_to_identify_a_row);
-		}else{
+		} else{
 			//so there's no primary key and no combined key...
 			//sorry, can't help you
 			throw new EE_Error(sprintf(__("Cannot delete objects of type %s because there is no primary key NOR combined key", "event_espresso"),get_class($this)));
@@ -1541,10 +1546,10 @@ 
 		if($field_to_count){
 			$field_obj = $this->field_settings_for($field_to_count);
 			$column_to_count = $field_obj->get_qualified_column();
-		}elseif($this->has_primary_key_field ()){
+		} elseif($this->has_primary_key_field ()){
 			$pk_field_obj = $this->get_primary_key_field();
 			$column_to_count = $pk_field_obj->get_qualified_column();
-		}else{//there's no primary key
+		} else{//there's no primary key
 			$column_to_count = '*';
 		}
 
@@ -1566,7 +1571,7 @@ 
 		if($field_to_sum){
 			$field_obj = $this->field_settings_for($field_to_sum);
 
-		}else{
+		} else{
 			$field_obj = $this->get_primary_key_field();
 		}
 		$column_to_count = $field_obj->get_qualified_column();
@@ -1575,7 +1580,7 @@ 
 		$return_value = $this->_do_wpdb_query('get_var',array( $SQL ) );
 		if($field_obj->get_wpdb_data_type() == '%d' || $field_obj->get_wpdb_data_type() == '%s' ){
 			return (int)$return_value;
-		}else{//must be %f
+		} else{//must be %f
 			return (float)$return_value;
 		}
 	}
@@ -1614,10 +1619,10 @@ 
 			$wpdb->show_errors( $old_show_errors_value );
 			if( ! empty( $wpdb->last_error ) ){
 				throw new EE_Error( sprintf( __( 'WPDB Error: "%s"', 'event_espresso' ), $wpdb->last_error ) );
-			}elseif( $result === false ){
+			} elseif( $result === false ){
 				throw new EE_Error( sprintf( __( 'WPDB Error occurred, but no error message was logged by wpdb! The wpdb method called was "%1$s" and the arguments were "%2$s"', 'event_espresso' ), $wpdb_method, var_export( $arguments_to_provide, true ) ) );
 			}
-		}elseif( $result === false ) {
+		} elseif( $result === false ) {
 			EE_Error::add_error( sprintf( __( 'A database error has occurred. Turn on WP_DEBUG for more information.', 'event_espresso' )), __FILE__, __FUNCTION__, __LINE__);
 		}
 		return $result;
@@ -1831,7 +1836,7 @@ 
 		$results = $this->get_all_related($id_or_obj,$other_model_name,$query_params);
 		if( $results ){
 			return array_shift($results);
-		}else{
+		} else{
 			return null;
 		}
 
@@ -1902,7 +1907,7 @@ 
 			 */
 			do_action( 'AHEE__EEM_Base__insert__end', $this, $field_n_values, $new_id );
 			return $new_id;
-		}else{
+		} else{
 			return FALSE;
 		}
 	}
@@ -1943,9 +1948,9 @@ 
 	public function get_one_conflicting($obj_or_fields_array, $include_primary_key = true ){
 		if($obj_or_fields_array instanceof EE_Base_Class){
 			$fields_n_values = $obj_or_fields_array->model_field_array();
-		}elseif( is_array($obj_or_fields_array)){
+		} elseif( is_array($obj_or_fields_array)){
 			$fields_n_values = $obj_or_fields_array;
-		}else{
+		} else{
 			throw new EE_Error(sprintf(__("%s get_all_conflicting should be called with a model object or an array of field names and values, you provided %d", "event_espresso"),get_class($this),$obj_or_fields_array));
 		}
 		$query_params = array();
@@ -1961,7 +1966,7 @@ 
 		//if there is nothing to base this search on, then we shouldn't find anything
 		if( empty( $query_params ) ){
 			return array();
-		}else{
+		} else{
 			return $this->get_one($query_params);
 		}
 	}
@@ -2034,12 +2039,12 @@ 
 		if($this->has_primary_key_field()){
 			if($this->get_primary_key_field()->is_auto_increment()){
 				return $wpdb->insert_id;
-			}else{
+			} else{
 				//it's not an auto-increment primary key, so
 				//it must have been supplied
 				return $fields_n_values[$this->get_primary_key_field()->get_name()];
 			}
-		}else{
+		} else{
 			//we can't return a  primary key because there is none. instead return
 			//a unique string indicating this model
 			return $this->get_index_primary_key_string($fields_n_values);
@@ -2086,7 +2091,7 @@ 
 					//leave the value alone
 			}
 			return $value;
-		}else{
+		} else{
 			return $value;
 		}
 	}
@@ -2179,7 +2184,7 @@ 
 		if(array_key_exists('group_by', $query_params)){
 			if(is_array($query_params['group_by'])){
 				$this->_extract_related_models_from_sub_params_array_values($query_params['group_by'],$query_info_carrier,'group_by');
-			}elseif( ! empty ( $query_params['group_by'] )){
+			} elseif( ! empty ( $query_params['group_by'] )){
 				$this->_extract_related_model_info_from_query_param( $query_params['group_by'],$query_info_carrier,'group_by');
 			}
 		}
@@ -2187,10 +2192,11 @@ 
 			$this->_extract_related_models_from_sub_params_array_keys($query_params[0], $query_info_carrier,'having');
 		}
 		if(array_key_exists('order_by', $query_params)){
-			if ( is_array( $query_params['order_by'] ) )
-				$this->_extract_related_models_from_sub_params_array_keys($query_params['order_by'],$query_info_carrier,'order_by');
-			elseif( ! empty( $query_params['order_by'] ))
-				$this->_extract_related_model_info_from_query_param( $query_params['order_by'], $query_info_carrier,'order_by');
+			if ( is_array( $query_params['order_by'] ) ) {
+							$this->_extract_related_models_from_sub_params_array_keys($query_params['order_by'],$query_info_carrier,'order_by');
+			} elseif( ! empty( $query_params['order_by'] )) {
+							$this->_extract_related_model_info_from_query_param( $query_params['order_by'], $query_info_carrier,'order_by');
+			}
 		}
 		if(array_key_exists('force_join', $query_params)){
 			$this->_extract_related_models_from_sub_params_array_values($query_params['force_join'],$query_info_carrier,'force_join');
@@ -2222,10 +2228,10 @@ 
 					if (! is_array($possibly_array_of_params)){
 						throw new EE_Error(sprintf(__("You used a special where query param %s, but the value isn't an array of where query params, it's just %s'. It should be an array, eg array('EVT_ID'=>23,'OR'=>array('Venue.VNU_ID'=>32,'Venue.VNU_name'=>'monkey_land'))", "event_espresso"),
 							$param,$possibly_array_of_params));
-					}else{
+					} else{
 						$this->_extract_related_models_from_sub_params_array_keys($possibly_array_of_params, $model_query_info_carrier,$query_param_type);
 					}
-				}elseif($query_param_type === 0 //ie WHERE
+				} elseif($query_param_type === 0 //ie WHERE
 						&& is_array($possibly_array_of_params)
 						&& isset($possibly_array_of_params[2])
 						&& $possibly_array_of_params[2] == true){
@@ -2281,7 +2287,7 @@ 
 	function _create_model_query_info_carrier($query_params){
 		if( isset( $query_params[0] ) ) {
 			$where_query_params = $query_params[0];
-		}else{
+		} else{
 			$where_query_params = array();
 		}
 		//first check if we should alter the query to account for caps or not
@@ -2303,7 +2309,7 @@ 
 		}
 		if( array_key_exists( 'default_where_conditions',$query_params) && ! empty( $query_params['default_where_conditions'] )){
 			$use_default_where_conditions = $query_params['default_where_conditions'];
-		}else{
+		} else{
 			$use_default_where_conditions = 'all';
 		}
 		$where_query_params = array_merge($this->_get_default_where_conditions_for_models_in_query($query_object,$use_default_where_conditions,$where_query_params), $where_query_params );
@@ -2326,7 +2332,7 @@ 
 				}
 				//they passed us an array for the limit. Assume it's like array(50,25), meaning offset by 50, and get 25
 				$query_object->set_limit_sql(" LIMIT ".$query_params['limit'][0].",".$query_params['limit'][1]);
-			}elseif( ! empty ( $query_params['limit'] )){
+			} elseif( ! empty ( $query_params['limit'] )){
 				$query_object->set_limit_sql((" LIMIT ".$query_params['limit']));
 			}
 		}
@@ -2348,11 +2354,11 @@ 
 					$order_array[] = $this->_deduce_column_name_from_query_param($field_name_to_order_by).SP.$order;
 				}
 				$query_object->set_order_by_sql(" ORDER BY ".implode(",",$order_array));
-			}elseif( ! empty ( $query_params['order_by'] )){
+			} elseif( ! empty ( $query_params['order_by'] )){
 				$this->_extract_related_model_info_from_query_param($query_params['order_by'],$query_object,'order',$query_params['order_by']);
 				if(isset($query_params['order'])){
 					$order = $this->_extract_order($query_params['order']);
-				}else{
+				} else{
 					$order = 'DESC';
 				}
 				$query_object->set_order_by_sql(" ORDER BY ".$this->_deduce_column_name_from_query_param($query_params['order_by']).SP.$order);
@@ -2375,7 +2381,7 @@ 
 					$group_by_array[] = $this->_deduce_column_name_from_query_param($field_name_to_group_by);
 				}
 				$query_object->set_group_by_sql(" GROUP BY ".implode(", ",$group_by_array));
-			}elseif( ! empty ( $query_params['group_by'] )){
+			} elseif( ! empty ( $query_params['group_by'] )){
 				$query_object->set_group_by_sql(" GROUP BY ".$this->_deduce_column_name_from_query_param($query_params['group_by']));
 			}
 		}
@@ -2399,8 +2405,9 @@ 
 			}
 		}
 		$main_model_join_sql = $query_object->get_main_model_join_sql();
-		if ( empty( $main_model_join_sql ) )
-			$query_object->set_main_model_join_sql($this->_construct_internal_join());
+		if ( empty( $main_model_join_sql ) ) {
+					$query_object->set_main_model_join_sql($this->_construct_internal_join());
+		}
 		return $query_object;
 	}
 
@@ -2433,7 +2440,7 @@ 
 	private function _extract_order($should_be_order_string){
 		if(in_array($should_be_order_string, $this->_allowed_order_values)){
 			return $should_be_order_string;
-		}else{
+		} else{
 			throw new EE_Error(sprintf(__("While performing a query on '%s', tried to use '%s' as an order parameter. ", "event_espresso"),get_class($this),$should_be_order_string));
 		}
 	}
@@ -2459,7 +2466,7 @@ 
 		}
 		if( in_array($use_default_where_conditions, array('all','this_model_only')) ){
 			$universal_query_params = $this->_get_default_where_conditions();
-		}else{
+		} else{
 			$universal_query_params = array();
 		}
 
@@ -2499,14 +2506,14 @@ 
 		foreach($default_where_conditions as $key => $val){
 			if( isset($provided_where_conditions[$key])){
 				$none_overridden = false;
-			}else{
+			} else{
 				$null_friendly_where_conditions[$or_condition_key_for_defaults]['AND'][$key] = $val;
 			}
 		}
 		if( $none_overridden && $default_where_conditions){
 			if($model->has_primary_key_field()){
 				$null_friendly_where_conditions[$or_condition_key_for_defaults][$model_relation_path.".".$model->primary_key_name()] = array('IS NULL');
-			}else{
+			} else{
 				//@todo NO PK, use other defaults
 			}
 		}
@@ -2522,8 +2529,9 @@ 
 	 * @return array like EEM_Base::get_all's $query_params[0] (where conditions)
 	 */
 	private function _get_default_where_conditions($model_relation_path = null){
-		if ( $this->_ignore_where_strategy )
-			return array();
+		if ( $this->_ignore_where_strategy ) {
+					return array();
+		}
 
 		return $this->_default_where_conditions_strategy->get_default_where_conditions($model_relation_path);
 	}
@@ -2597,7 +2605,7 @@ 
 		if(array_key_exists($query_param,$this_model_fields)){
 			if($allow_fields){
 				return;
-			}else{
+			} else{
 				throw new EE_Error(sprintf(__("Using a field name (%s) on model %s is not allowed on this query param type '%s'. Original query param was %s", "event_espresso"),
 						$query_param,get_class($this),$query_param_type,$original_query_param));
 			}
@@ -2606,7 +2614,7 @@ 
 		elseif(in_array($query_param, $this->_logic_query_param_keys, TRUE)){
 			if($allow_logic_query_params){
 				return;
-			}else{
+			} else{
 				throw new EE_Error(
 					sprintf(
 						__( 'Logic query params ("%1$s") are being used incorrectly with the following query param ("%2$s") on model %3$s. %4$sAdditional Info:%4$s%5$s', 'event_espresso' ),
@@ -2636,12 +2644,12 @@ 
 					//we should actually end in a field name, not a model like this!
 					throw new EE_Error(sprintf(__("Query param '%s' (of type %s on model %s) shouldn't end on a period (.) ", "event_espresso"),
 					$query_param,$query_param_type,get_class($this),$valid_related_model_name));
-				}else{
+				} else{
 					$related_model_obj = $this->get_related_model_obj($valid_related_model_name);
 					$related_model_obj->_extract_related_model_info_from_query_param($query_param, $passed_in_query_info, $query_param_type, $original_query_param);
 					return;
 				}
-			}elseif($query_param == $valid_related_model_name){
+			} elseif($query_param == $valid_related_model_name){
 				$this->_add_join_to_model($valid_related_model_name, $passed_in_query_info,$original_query_param);
 				return;
 			}
@@ -2701,7 +2709,7 @@ 
 		$SQL = $this->_construct_condition_clause_recursive($where_params, ' AND ');
 		if($SQL){
 			return " WHERE ". $SQL;
-		}else{
+		} else{
 			return '';
 		}
 	}
@@ -2716,7 +2724,7 @@ 
 		$SQL = $this->_construct_condition_clause_recursive($having_params, ' AND ');
 		if($SQL){
 			return " HAVING ". $SQL;
-		}else{
+		} else{
 			return '';
 		}
 
@@ -2739,7 +2747,7 @@ 
 			$model_instance=call_user_func($model_name."::instance");
 			/* @var $model_instance EEM_Base */
 			return $model_instance->field_settings_for($field_name);
-		}else{
+		} else{
 			throw new EE_Error(sprintf(__('No model named %s exists, with classname %s and filepath %s','event_espresso'),$model_name,$model_class,$model_filepath));
 		}
 	}
@@ -2772,14 +2780,14 @@ 
 						$where_clauses[] = " (". $this->_construct_condition_clause_recursive($op_and_value_or_sub_condition, ' OR ') .")";
 						break;
 				}
-			}else{
+			} else{
 				$field_obj = $this->_deduce_field_from_query_param($query_param);
 
 				//if it's not a normal field, maybe it's a custom selection?
 				if( ! $field_obj){
 					if(isset( $this->_custom_selections[$query_param][1])){
 						$field_obj = $this->_custom_selections[$query_param][1];
-					}else{
+					} else{
 						throw new EE_Error(sprintf(__("%s is neither a valid model field name, nor a custom selection", "event_espresso"),$query_param));
 					}
 				}
@@ -2789,7 +2797,7 @@ 
 		}
 		if($where_clauses){
 			$SQL = implode($glue,$where_clauses);
-		}else{
+		} else{
 			$SQL = '';
 		}
 		return $SQL;
@@ -2809,11 +2817,11 @@ 
 		if( $field ){
 			$table_alias_prefix = EE_Model_Parser::extract_table_alias_model_relation_chain_from_query_param( $field->get_model_name(), $query_param );
 			return $table_alias_prefix . $field->get_qualified_column();
-		}elseif(array_key_exists($query_param,$this->_custom_selections)){
+		} elseif(array_key_exists($query_param,$this->_custom_selections)){
 			//maybe it's custom selection item?
 			//if so, just use it as the "column name"
 			return $query_param;
-		}else{
+		} else{
 			throw new EE_Error(sprintf(__("%s is not a valid field on this model, nor a custom selection (%s)", "event_espresso"),$query_param,implode(",",$this->_custom_selections)));
 		}
 	}
@@ -2830,7 +2838,7 @@ 
 		$pos_of_star = strpos($condition_query_param_key, '*');
 		if($pos_of_star === FALSE){
 			return $condition_query_param_key;
-		}else{
+		} else{
 			$condition_query_param_sans_star = substr($condition_query_param_key, 0, $pos_of_star);
 			return $condition_query_param_sans_star;
 		}
@@ -2856,7 +2864,7 @@ 
 				throw new EE_Error(sprintf(__("You setup a query parameter like you were going to specify an operator, but didn't. You provided '(%s)', but the operator should be at array key index 0 (eg array('>',32))", "event_espresso"), implode(",",$php_array_like_string)));
 			}
 			$value = isset($op_and_value[1]) ? $op_and_value[1] : null;
-		}else{
+		} else{
 			$operator = '=';
 			$value = $op_and_value;
 		}
@@ -2864,7 +2872,7 @@ 
 		//check to see if the value is actually another field
 		if(is_array($op_and_value) && isset($op_and_value[2]) && $op_and_value[2] == true){
 			return $operator.SP.$this->_deduce_column_name_from_query_param($value);
-		}elseif(in_array($operator, $this->_in_style_operators) && is_array($value)){
+		} elseif(in_array($operator, $this->_in_style_operators) && is_array($value)){
 			//in this case, the value should be an array, or at least a comma-separated list
 			//it will need to handle a little differently
 			$cleaned_value = $this->_construct_in_value($value, $field_obj);
@@ -2872,8 +2880,9 @@ 
 			return $operator.SP.$cleaned_value;
 		} elseif( in_array( $operator, $this->_between_style_operators ) && is_array( $value ) ) {
 			//the value should be an array with count of two.
-			if ( count($value) !== 2 )
-				throw new EE_Error( sprintf( __("The '%s' operator must be used with an array of values and there must be exactly TWO values in that array.", 'event_espresso'), "BETWEEN" ) );
+			if ( count($value) !== 2 ) {
+							throw new EE_Error( sprintf( __("The '%s' operator must be used with an array of values and there must be exactly TWO values in that array.", 'event_espresso'), "BETWEEN" ) );
+			}
 			$cleaned_value = $this->_construct_between_value( $value, $field_obj );
 			return $operator.SP.$cleaned_value;
 		} elseif( in_array( $operator, $this->_null_style_operators ) ) {
@@ -2881,17 +2890,17 @@ 
 				throw new EE_Error(sprintf(__("You attempted to give a value  (%s) while using a NULL-style operator (%s). That isn't valid", "event_espresso"),$value,$operator));
 			}
 			return $operator;
-		}elseif( $operator == 'LIKE' && ! is_array($value)){
+		} elseif( $operator == 'LIKE' && ! is_array($value)){
 			//if the operator is 'LIKE', we want to allow percent signs (%) and not
 			//remove other junk. So just treat it as a string.
 			return $operator.SP.$this->_wpdb_prepare_using_field($value, '%s');
-		}elseif( ! in_array($operator, $this->_in_style_operators) && ! is_array($value)){
+		} elseif( ! in_array($operator, $this->_in_style_operators) && ! is_array($value)){
 			return $operator.SP.$this->_wpdb_prepare_using_field($value,$field_obj);
-		}elseif(in_array($operator, $this->_in_style_operators) && ! is_array($value)){
+		} elseif(in_array($operator, $this->_in_style_operators) && ! is_array($value)){
 			throw new EE_Error(sprintf(__("Operator '%s' must be used with an array of values, eg 'Registration.REG_ID' => array('%s',array(1,2,3))",'event_espresso'),$operator, $operator));
-		}elseif( ! in_array($operator, $this->_in_style_operators) && is_array($value)){
+		} elseif( ! in_array($operator, $this->_in_style_operators) && is_array($value)){
 			throw new EE_Error(sprintf(__("Operator '%s' must be used with a single value, not an array. Eg 'Registration.REG_ID => array('%s',23))",'event_espresso'),$operator,$operator));
-		}else{
+		} else{
 			throw new EE_Error(sprintf(__("It appears you've provided some totally invalid query parameters. Operator and value were:'%s', which isn't right at all", "event_espresso"),  http_build_query($op_and_value)));
 		}
 	}
@@ -2960,7 +2969,7 @@ 
 		global $wpdb;
 		if($field_obj instanceof EE_Model_Field_Base){
 			return $wpdb->prepare($field_obj->get_wpdb_data_type(),$this->_prepare_value_for_use_in_db($value, $field_obj));
-		}else{//$field_obj should really just be a data type
+		} else{//$field_obj should really just be a data type
 			if( ! in_array($field_obj,$this->_valid_wpdb_data_types)){
 				throw new EE_Error(sprintf(__("%s is not a valid wpdb datatype. Valid ones are %s", "event_espresso"),$field_obj,implode(",",$this->_valid_wpdb_data_types)));
 			}
@@ -2989,14 +2998,14 @@ 
 		if($number_of_parts == 1){
 			$field_name = $last_query_param_part;
 			$model_obj = $this;
-		}else{// $number_of_parts >= 2
+		} else{// $number_of_parts >= 2
 			//the last part is the column name, and there are only 2parts. therefore...
 			$field_name = $last_query_param_part;
 			$model_obj = $this->get_related_model_obj( $query_param_parts[ $number_of_parts - 2 ]);
 		}
 		try{
 			return $model_obj->field_settings_for($field_name);
-		}catch(EE_Error $e){
+		} catch(EE_Error $e){
 			return null;
 		}
 	}
@@ -3015,7 +3024,7 @@ 
 		$field = isset($all_fields[$field_name]) ? $all_fields[$field_name] : FALSE;
 		if($field){
 			return $field->get_qualified_column();
-		}else{
+		} else{
 			throw new EE_Error(sprintf(__("There is no field titled %s on model %s. Either the query trying to use it is bad, or you need to add it to the list of fields on the model.",'event_espresso'),$field_name,get_class($this)));
 		}
 	}
@@ -3081,7 +3090,7 @@ 
 					//the FROM statement, BUT the primary table isn't. So we want
 					//to add the inverse join sql
 					$SQL .= $table_obj->get_inverse_join_sql($alias_prefixed);
-				}else{
+				} else{
 					//just add a regular JOIN to this table from the primary table
 					$SQL .= $table_obj->get_join_sql($alias_prefixed);
 				}
@@ -3196,7 +3205,7 @@ 
 		$fieldSettings = $this->field_settings(true);
 		if( isset($fieldSettings[$fieldName])){
 			return true;
-		}else{
+		} else{
 			return false;
 		}
 	}
@@ -3210,7 +3219,7 @@ 
 		$relations = $this->relation_settings();
 		if(isset($relations[$relation_name])){
 			return true;
-		}else{
+		} else{
 			return false;
 		}
 	}
@@ -3261,7 +3270,7 @@ 
 			try{
 				$this->get_primary_key_field();
 				$this->_has_primary_key_field = true;
-			}catch(EE_Error $e){
+			} catch(EE_Error $e){
 				$this->_has_primary_key_field = false;
 			}
 		}
@@ -3340,7 +3349,7 @@ 
 				}
 			}
 			return $this->_cached_fields;
-		}else{
+		} else{
 			if( $this->_cached_fields_non_db_only === NULL ){
 				$this->_cached_fields_non_db_only = array();
 				foreach($this->_fields as $fields_corresponding_to_table){
@@ -3473,7 +3482,7 @@ 
 			if(empty( $this_model_fields_n_values[$this->primary_key_name()] )){
 				return NULL;
 			}
-		}else if($this->unique_indexes()){
+		} else if($this->unique_indexes()){
 			$first_column = reset($this_model_fields_n_values);
 			if(empty($first_column)){
 				return NULL;
@@ -3488,7 +3497,7 @@ 
 				// add this new object to the entity map
 				$classInstance = $this->add_to_entity_map( $classInstance );
 			}
-		}else{
+		} else{
 			$classInstance = EE_Registry::instance()->load_class( $className, array( $this_model_fields_n_values, $this->_timezone ), TRUE, FALSE );
 		}
 
@@ -3573,11 +3582,12 @@ 
 						$this_model_fields_n_values[$field_name] = $field_obj->get_default_value();
 					}
 				}
-			}else{
+			} else{
 				//the table's rows existed. Use their values
 				foreach( $this->_get_fields_for_table( $table_alias ) as $field_name => $field_obj ) {
-					if( ! $field_obj->is_db_only_field() )
-					$this_model_fields_n_values[$field_name] = $this->_get_column_value_with_table_alias_or_not($cols_n_values, $field_obj->get_qualified_column(), $field_obj->get_table_column() );
+					if( ! $field_obj->is_db_only_field() ) {
+										$this_model_fields_n_values[$field_name] = $this->_get_column_value_with_table_alias_or_not($cols_n_values, $field_obj->get_qualified_column(), $field_obj->get_table_column() );
+					}
 				}
 			}
 		}
@@ -3591,9 +3601,9 @@ 
 		if( isset( $cols_n_values[ $qualified_column ] ) ){
 			$value = $cols_n_values[ $qualified_column ];
 
-		}elseif( isset( $cols_n_values[ $regular_column ] ) ){
+		} elseif( isset( $cols_n_values[ $regular_column ] ) ){
 			$value = $cols_n_values[ $regular_column ];
-		}else{
+		} else{
 			$value = NULL;
 		}
 
@@ -3626,7 +3636,7 @@ 
 				}
 			}
 			return $obj_in_map;
-		}else{
+		} else{
 			return $this->get_one_by_ID( $id );
 		}
 	}
@@ -3661,7 +3671,7 @@ 
 				}
 			}
 			return $obj_in_map;
-		}else{
+		} else{
 			$this->add_to_entity_map( $replacing_model_obj );
 			return $replacing_model_obj;
 		}
@@ -3691,7 +3701,7 @@ 
 	public function item_name($quantity = 1){
 		if($quantity == 1){
 			return $this->singular_item;
-		}else{
+		} else{
 			return $this->plural_item;
 		}
 	}
@@ -3753,14 +3763,14 @@ 
 		$primary_key_field = $this->get_primary_key_field();
 		if( $base_class_obj_or_id instanceof $className ){
 			$model_object = $base_class_obj_or_id;
-		}elseif( $primary_key_field instanceof EE_Primary_Key_Int_Field && (
+		} elseif( $primary_key_field instanceof EE_Primary_Key_Int_Field && (
 				is_int( $base_class_obj_or_id ) ||
 				is_string( $base_class_obj_or_id ) )){//assume it's an ID. either a proper integer or a string representing an integer (eg "101" instead of 101)
 			$model_object = $this->get_one_by_ID($base_class_obj_or_id);
-		}elseif( $primary_key_field instanceof EE_Primary_Key_String_Field && is_string($base_class_obj_or_id) ){
+		} elseif( $primary_key_field instanceof EE_Primary_Key_String_Field && is_string($base_class_obj_or_id) ){
 			//assume its a string representation of the object
 			$model_object = $this->get_one_by_ID($base_class_obj_or_id);
-		}else{
+		} else{
 			throw new EE_Error(sprintf(__("'%s' is neither an object of type %s, nor an ID! Its full value is '%s'",'event_espresso'),$base_class_obj_or_id,$this->_get_class_name(),print_r($base_class_obj_or_id,true)));
 		}
 		if( $model_object->ID() == NULL && $ensure_is_in_db){
@@ -3784,13 +3794,13 @@ 
 		if( $base_class_obj_or_id instanceof $className ){
 			/** @var $base_class_obj_or_id EE_Base_Class */
 			$id = $base_class_obj_or_id->ID();
-		}elseif(is_int($base_class_obj_or_id)){
+		} elseif(is_int($base_class_obj_or_id)){
 			//assume it's an ID
 			$id = $base_class_obj_or_id;
-		}elseif(is_string($base_class_obj_or_id)){
+		} elseif(is_string($base_class_obj_or_id)){
 			//assume its a string representation of the object
 			$id = $base_class_obj_or_id;
-		}else{
+		} else{
 			throw new EE_Error(sprintf(__("'%s' is neither an object of type %s, nor an ID! Its full value is '%s'",'event_espresso'),$base_class_obj_or_id,$this->_get_class_name(),print_r($base_class_obj_or_id,true)));
 		}
 		return $id;
@@ -3921,9 +3931,9 @@ 
 
 		if($model_object_or_attributes_array instanceof EE_Base_Class){
 			$attributes_array = $model_object_or_attributes_array->model_field_array();
-		}elseif(is_array($model_object_or_attributes_array)){
+		} elseif(is_array($model_object_or_attributes_array)){
 			$attributes_array = $model_object_or_attributes_array;
-		}else{
+		} else{
 			throw new EE_Error(sprintf(__("get_all_copies should be provided with either a model object or an array of field-value-pairs, but was given %s", "event_espresso"),$model_object_or_attributes_array));
 		}
 		//even copies obviously won't have the same ID, so remove the primary key
@@ -3933,7 +3943,7 @@ 
 		}
 		if(isset($query_params[0])){
 			$query_params[0] = array_merge($attributes_array,$query_params);
-		}else{
+		} else{
 			$query_params[0] = $attributes_array;
 		}
 		return $this->get_all($query_params);
@@ -3956,7 +3966,7 @@ 
 		$copies = $this->get_all_copies($model_object_or_attributes_array,$query_params);
 		if(is_array($copies)){
 			return array_shift($copies);
-		}else{
+		} else{
 			return null;
 		}
 	}
@@ -3988,7 +3998,7 @@ 
 		$sql_operator = isset($this->_valid_operators[$operator_supplied]) ? $this->_valid_operators[$operator_supplied] : null;
 		if($sql_operator){
 			return $sql_operator;
-		}else{
+		} else{
 			throw new EE_Error(sprintf(__("The operator '%s' is not in the list of valid operators: %s", "event_espresso"),$operator_supplied,implode(",",array_keys($this->_valid_operators))));
 		}
 	}
@@ -4127,7 +4137,7 @@ 
 		$valid_cap_contexts = EEM_Base::valid_cap_contexts();
 		if( in_array( $context, $valid_cap_contexts ) ) {
 			return true;
-		}else{
+		} else{
 			throw new EE_Error(
 				sprintf(
 					__( 'Context "%1$s" passed into model "%2$s" is not a valid context. They are: %3$s', 'event_espresso' ),

core/db_models/EEM_CPT_Base.model.php

Spacing +83 added lines, -83 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-define('EE_Event_Category_Taxonomy','espresso_event_category');
+define('EE_Event_Category_Taxonomy', 'espresso_event_category');
 /**
  *
  * EEM_CPT_Base
@@ -16,7 +16,7 @@ 
  * @author 				Mike Nelson
  *
  */
-abstract class EEM_CPT_Base extends EEM_Soft_Delete_Base{
+abstract class EEM_CPT_Base extends EEM_Soft_Delete_Base {
 
 	/**
 	 * @var string post_status_trashed - the wp post status for trashed cpts
@@ -44,42 +44,42 @@ 
 	 * @param string $timezone
 	 * @throws \EE_Error
 	 */
-	protected function __construct( $timezone = NULL ){
+	protected function __construct($timezone = NULL) {
 
 		//adds a relationship to Term_Taxonomy for all these models. For this to work
 		//Term_Relationship must have a relation to each model subclassing EE_CPT_Base explicitly
 		//eg, in EEM_Term_Relationship, inside the _model_relations array, there must be an entry
 		//with key equalling the subclassing model's model name (eg 'Event' or 'Venue'), and the value
 		//must also be new EE_HABTM_Relation('Term_Relationship');
-		$this->_model_relations['Term_Taxonomy'] =new EE_HABTM_Relation('Term_Relationship');
+		$this->_model_relations['Term_Taxonomy'] = new EE_HABTM_Relation('Term_Relationship');
 		$primary_table_name = NULL;
 		//add  the common _status field to all CPT primary tables.
-		foreach ( $this->_tables as $alias => $table_obj ) {
-			if ( $table_obj instanceof EE_Primary_Table ) {
+		foreach ($this->_tables as $alias => $table_obj) {
+			if ($table_obj instanceof EE_Primary_Table) {
 				$primary_table_name = $alias;
 			}
 		}
 		//set default wp post statuses if child has not already set.
-		if ( ! isset( $this->_fields[$primary_table_name]['status'] )) {
+		if ( ! isset($this->_fields[$primary_table_name]['status'])) {
 			$this->_fields[$primary_table_name]['status'] = new EE_WP_Post_Status_Field('post_status', __("Event Status", "event_espresso"), false, 'draft');
 		}
-		if( ! isset( $this->_fields[$primary_table_name]['to_ping'])){
-			$this->_fields[$primary_table_name]['to_ping'] = new EE_DB_Only_Text_Field('to_ping', __( 'To Ping', 'event_espresso' ), FALSE, '');
+		if ( ! isset($this->_fields[$primary_table_name]['to_ping'])) {
+			$this->_fields[$primary_table_name]['to_ping'] = new EE_DB_Only_Text_Field('to_ping', __('To Ping', 'event_espresso'), FALSE, '');
 		}
-		if( ! isset( $this->_fields[$primary_table_name]['pinged'])){
-			$this->_fields[$primary_table_name]['pinged'] = new EE_DB_Only_Text_Field('pinged', __( 'Pinged', 'event_espresso' ), FALSE, '');
+		if ( ! isset($this->_fields[$primary_table_name]['pinged'])) {
+			$this->_fields[$primary_table_name]['pinged'] = new EE_DB_Only_Text_Field('pinged', __('Pinged', 'event_espresso'), FALSE, '');
 		}
 
-		if( ! isset( $this->_fields[$primary_table_name]['comment_status'])){
-			$this->_fields[$primary_table_name]['comment_status'] = new EE_Plain_Text_Field('comment_status', __('Comment Status', 'event_espresso' ), FALSE, 'open');
+		if ( ! isset($this->_fields[$primary_table_name]['comment_status'])) {
+			$this->_fields[$primary_table_name]['comment_status'] = new EE_Plain_Text_Field('comment_status', __('Comment Status', 'event_espresso'), FALSE, 'open');
 		}
 
-		if( ! isset( $this->_fields[$primary_table_name]['ping_status'])){
+		if ( ! isset($this->_fields[$primary_table_name]['ping_status'])) {
 			$this->_fields[$primary_table_name]['ping_status'] = new EE_Plain_Text_Field('ping_status', __('Ping Status', 'event_espresso'), FALSE, 'open');
 		}
 
-		if( ! isset( $this->_fields[$primary_table_name]['post_content_filtered'])){
-			$this->_fields[$primary_table_name]['post_content_filtered'] = new EE_DB_Only_Text_Field('post_content_filtered', __( 'Post Content Filtered', 'event_espresso' ), FALSE, '');
+		if ( ! isset($this->_fields[$primary_table_name]['post_content_filtered'])) {
+			$this->_fields[$primary_table_name]['post_content_filtered'] = new EE_DB_Only_Text_Field('post_content_filtered', __('Post Content Filtered', 'event_espresso'), FALSE, '');
 		}
 		parent::__construct($timezone);
 
@@ -92,7 +92,7 @@ 
 	 */
 	public function public_event_stati() {
 		// @see wp-includes/post.php
-		return get_post_stati( array( 'public' => TRUE ));
+		return get_post_stati(array('public' => TRUE));
 	}
 
 
@@ -103,7 +103,7 @@ 
 	 * @return string
 	 * @throws EE_Error
 	 */
-	public function deleted_field_name(){
+	public function deleted_field_name() {
 		throw new EE_Error(sprintf(__("EEM_CPT_Base should nto call deleted_field_name! It should instead use post_status_field_name", "event_espresso")));
 	}
 
@@ -114,12 +114,12 @@ 
 	 * @return string
 	 * @throws EE_Error
 	 */
-	public function post_status_field_name(){
+	public function post_status_field_name() {
 		$field = $this->get_a_field_of_type('EE_WP_Post_Status_Field');
-		if($field){
+		if ($field) {
 			return $field->get_name();
-		}else{
-			throw new EE_Error(sprintf(__('We are trying to find the post status flag field on %s, but none was found. Are you sure there is a field of type EE_Trashed_Flag_Field in %s constructor?','event_espresso'),get_class($this),get_class($this)));
+		} else {
+			throw new EE_Error(sprintf(__('We are trying to find the post status flag field on %s, but none was found. Are you sure there is a field of type EE_Trashed_Flag_Field in %s constructor?', 'event_espresso'), get_class($this), get_class($this)));
 		}
 	}
 
@@ -130,9 +130,9 @@ 
 	 * @param array $query_params like EEM_Base::get_all's $query_params
 	 * @return array like EEM_Base::get_all's $query_params
 	 */
-	protected function _alter_query_params_so_only_trashed_items_included($query_params){
-		$post_status_field_name=$this->post_status_field_name();
-		$query_params[0][$post_status_field_name]=self::post_status_trashed;
+	protected function _alter_query_params_so_only_trashed_items_included($query_params) {
+		$post_status_field_name = $this->post_status_field_name();
+		$query_params[0][$post_status_field_name] = self::post_status_trashed;
 		return $query_params;
 	}
 
@@ -143,9 +143,9 @@ 
 	 * @param array $query_params
 	 * @return array
 	 */
-	protected function _alter_query_params_so_deleted_and_undeleted_items_included($query_params){
-		$post_status_field_name=$this->post_status_field_name();
-		$query_params[0][$post_status_field_name]=array('IN',array_keys($this->get_status_array()));
+	protected function _alter_query_params_so_deleted_and_undeleted_items_included($query_params) {
+		$post_status_field_name = $this->post_status_field_name();
+		$query_params[0][$post_status_field_name] = array('IN', array_keys($this->get_status_array()));
 		return $query_params;
 	}
 
@@ -157,11 +157,11 @@ 
 	 * @param array $query_params like EEM_Base::get_all
 	 * @return boolean success
 	 */
-	function delete_or_restore($delete=true,$query_params = array()){
-		$post_status_field_name=$this->post_status_field_name();
+	function delete_or_restore($delete = true, $query_params = array()) {
+		$post_status_field_name = $this->post_status_field_name();
 		$query_params = $this->_alter_query_params_so_deleted_and_undeleted_items_included($query_params);
 		$new_status = $delete ? self::post_status_trashed : 'draft';
-		if ( $this->update (array($post_status_field_name=>$new_status), $query_params )) {
+		if ($this->update(array($post_status_field_name=>$new_status), $query_params)) {
 			return TRUE;
 		} else {
 			return FALSE;
@@ -178,7 +178,7 @@ 
 	 */
 	public function meta_table() {
 		$meta_table = $this->_get_other_tables();
-		$meta_table = reset( $meta_table );
+		$meta_table = reset($meta_table);
 		return $meta_table instanceof EE_Secondary_Table ? $meta_table->get_table_name() : NULL;
 	}
 
@@ -190,16 +190,16 @@ 
 	 * @param  bool $all triggers whether we include DB_Only fields or JUST non DB_Only fields.  Defaults to false (no db only fields)
 	 * @return array
 	 */
-	public function get_meta_table_fields( $all = FALSE ) {
+	public function get_meta_table_fields($all = FALSE) {
 		$all_fields = $fields_to_return = array();
-		foreach ( $this->_tables as $alias => $table_obj ) {
-			if ( $table_obj instanceof EE_Secondary_Table )
-				$all_fields = array_merge( $this->_get_fields_for_table($alias), $all_fields );
+		foreach ($this->_tables as $alias => $table_obj) {
+			if ($table_obj instanceof EE_Secondary_Table)
+				$all_fields = array_merge($this->_get_fields_for_table($alias), $all_fields);
 		}
 
-		if ( !$all ) {
-			foreach ( $all_fields as $name => $obj ) {
-				if ( $obj instanceof EE_DB_Only_Field_Base )
+		if ( ! $all) {
+			foreach ($all_fields as $name => $obj) {
+				if ($obj instanceof EE_DB_Only_Field_Base)
 					continue;
 				$fields_to_return[] = $name;
 			}
@@ -222,13 +222,13 @@ 
 	 * @param int $parent_term_taxonomy_id
 	 * @return EE_Term_Taxonomy
 	 */
-	function add_event_category(EE_CPT_Base $cpt_model_object, $category_name, $category_description ='',$parent_term_taxonomy_id = null){
+	function add_event_category(EE_CPT_Base $cpt_model_object, $category_name, $category_description = '', $parent_term_taxonomy_id = null) {
 		//create term
-		require_once( EE_MODELS . 'EEM_Term.model.php');
+		require_once(EE_MODELS.'EEM_Term.model.php');
 		//first, check for a term by the same name or slug
 		$category_slug = sanitize_title($category_name);
-		$term = EEM_Term::instance()->get_one(array(array('OR'=>array('name'=>$category_name,'slug'=>$category_slug))));
-		if( ! $term ){
+		$term = EEM_Term::instance()->get_one(array(array('OR'=>array('name'=>$category_name, 'slug'=>$category_slug))));
+		if ( ! $term) {
 			$term = EE_Term::new_instance(array(
 				'name'=>$category_name,
 				'slug'=>$category_slug
@@ -236,10 +236,10 @@ 
 			$term->save();
 		}
 		//make sure there's a term-taxonomy entry too
-		require_once( EE_MODELS . 'EEM_Term_Taxonomy.model.php');
-		$term_taxonomy = EEM_Term_Taxonomy::instance()->get_one(array(array('term_id'=>$term->ID(),'taxonomy'=>EE_Event_Category_Taxonomy)));
+		require_once(EE_MODELS.'EEM_Term_Taxonomy.model.php');
+		$term_taxonomy = EEM_Term_Taxonomy::instance()->get_one(array(array('term_id'=>$term->ID(), 'taxonomy'=>EE_Event_Category_Taxonomy)));
 		/** @var $term_taxonomy EE_Term_Taxonomy */
-		if( ! $term_taxonomy ){
+		if ( ! $term_taxonomy) {
 			$term_taxonomy = EE_Term_Taxonomy::new_instance(array(
 				'term_id'=>$term->ID(),
 				'taxonomy'=>EE_Event_Category_Taxonomy,
@@ -248,7 +248,7 @@ 
 				'parent'=>$parent_term_taxonomy_id
 			));
 			$term_taxonomy->save();
-		}else{
+		} else {
 			$term_taxonomy->set_count($term_taxonomy->count() + 1);
 			$term_taxonomy->save();
 		}
@@ -263,11 +263,11 @@ 
 	 * @param string $category_name name of the event category (term)
 	 * @return bool
 	 */
-	function remove_event_category(EE_CPT_Base $cpt_model_object_event, $category_name){
+	function remove_event_category(EE_CPT_Base $cpt_model_object_event, $category_name) {
 		//find the term_taxonomy by that name
-		$term_taxonomy = $this->get_first_related($cpt_model_object_event, 'Term_Taxonomy', array(array('Term.name'=>$category_name,'taxonomy'=>EE_Event_Category_Taxonomy)));
+		$term_taxonomy = $this->get_first_related($cpt_model_object_event, 'Term_Taxonomy', array(array('Term.name'=>$category_name, 'taxonomy'=>EE_Event_Category_Taxonomy)));
 		/** @var $term_taxonomy EE_Term_Taxonomy */
-		if( $term_taxonomy ){
+		if ($term_taxonomy) {
 			$term_taxonomy->set_count($term_taxonomy->count() - 1);
 			$term_taxonomy->save();
 		}
@@ -287,8 +287,8 @@ 
 	 * @param string|array $attr Optional. Query string or array of attributes.
 	 * @return string HTML image element
 	 */
-	public function get_feature_image( $id, $size = 'thumbnail', $attr = '' ) {
-		return get_the_post_thumbnail( $id, $size, $attr );
+	public function get_feature_image($id, $size = 'thumbnail', $attr = '') {
+		return get_the_post_thumbnail($id, $size, $attr);
 	}
 
 
@@ -301,10 +301,10 @@ 
 	 * @global array $wp_post_statuses set in wp core for storing all the post stati
 	 * @return array
 	 */
-	public function get_post_statuses(){
+	public function get_post_statuses() {
 		global $wp_post_statuses;
 		$statuses = array();
-		foreach($wp_post_statuses as $post_status => $args_object){
+		foreach ($wp_post_statuses as $post_status => $args_object) {
 			$statuses[$post_status] = $args_object->label;
 		}
 		return $statuses;
@@ -319,9 +319,9 @@ 
 	public function get_status_array() {
 		$statuses = $this->get_post_statuses();
 		//first the global filter
-		$statuses = apply_filters( 'FHEE_EEM_CPT_Base__get_status_array', $statuses );
+		$statuses = apply_filters('FHEE_EEM_CPT_Base__get_status_array', $statuses);
 		//now the class specific filter
-		$statuses = apply_filters( 'FHEE_EEM_' . get_class($this) . '__get_status_array', $statuses );
+		$statuses = apply_filters('FHEE_EEM_'.get_class($this).'__get_status_array', $statuses);
 		return $statuses;
 	}
 
@@ -333,7 +333,7 @@ 
 	 */
 	public function get_custom_post_statuses() {
 		$new_stati = array();
-		foreach ( $this->_custom_stati as $status => $props ) {
+		foreach ($this->_custom_stati as $status => $props) {
 			$new_stati[$status] = $props['label'];
 		}
 		return $new_stati;
@@ -349,24 +349,24 @@ 
 	 * @param WP_Post|array $post
 	 * @return EE_CPT_Base
 	 */
-	public function instantiate_class_from_post_object_orig($post){
-		$post = (array)$post;
+	public function instantiate_class_from_post_object_orig($post) {
+		$post = (array) $post;
 		$has_all_necessary_fields_for_table = true;
 		//check if the post has fields on the meta table already
-		foreach($this->_get_other_tables() as $table_obj){
+		foreach ($this->_get_other_tables() as $table_obj) {
 			$fields_for_that_table = $this->_get_fields_for_table($table_obj->get_table_alias());
-			foreach($fields_for_that_table as $field_obj){
-				if( ! isset($post[$field_obj->get_table_column()])
-					&& ! isset($post[$field_obj->get_qualified_column()])){
+			foreach ($fields_for_that_table as $field_obj) {
+				if ( ! isset($post[$field_obj->get_table_column()])
+					&& ! isset($post[$field_obj->get_qualified_column()])) {
 					$has_all_necessary_fields_for_table = false;
 				}
 			}
 		}
 		//if we don't have all the fields we need, then just fetch the proper model from the DB
-		if( ! $has_all_necessary_fields_for_table){
+		if ( ! $has_all_necessary_fields_for_table) {
 
 			return $this->get_one_by_ID($post['ID']);
-		}else{
+		} else {
 			return $this->instantiate_class_from_array_or_object($post);
 		}
 	}
@@ -377,30 +377,30 @@ 
 	 * @param null $post
 	 * @return EE_Base_Class|EE_Soft_Delete_Base_Class
 	 */
-	public function instantiate_class_from_post_object( $post = NULL ){
-		if ( empty( $post )) {
+	public function instantiate_class_from_post_object($post = NULL) {
+		if (empty($post)) {
 			global $post;
 		}
-		$post = (array)$post;
+		$post = (array) $post;
 		$tables_needing_to_be_queried = array();
 		//check if the post has fields on the meta table already
-		foreach($this->get_tables() as $table_obj){
+		foreach ($this->get_tables() as $table_obj) {
 			$fields_for_that_table = $this->_get_fields_for_table($table_obj->get_table_alias());
-			foreach($fields_for_that_table as $field_obj){
-				if( ! isset($post[$field_obj->get_table_column()])
-					&& ! isset($post[$field_obj->get_qualified_column()])){
+			foreach ($fields_for_that_table as $field_obj) {
+				if ( ! isset($post[$field_obj->get_table_column()])
+					&& ! isset($post[$field_obj->get_qualified_column()])) {
 					$tables_needing_to_be_queried[$table_obj->get_table_alias()] = $table_obj;
 				}
 			}
 		}
 		//if we don't have all the fields we need, then just fetch the proper model from the DB
-		if( $tables_needing_to_be_queried){
-			if(count($tables_needing_to_be_queried) == 1 && reset($tables_needing_to_be_queried) instanceof EE_Secondary_Table){
+		if ($tables_needing_to_be_queried) {
+			if (count($tables_needing_to_be_queried) == 1 && reset($tables_needing_to_be_queried) instanceof EE_Secondary_Table) {
 				//so we're only missing data from a secondary table. Well that's not too hard to query for
 				$table_to_query = reset($tables_needing_to_be_queried);
-				$missing_data = $this->_do_wpdb_query( 'get_row', array( 'SELECT * FROM ' . $table_to_query->get_table_name() . ' WHERE ' . $table_to_query->get_fk_on_table() . ' = ' . $post['ID'], ARRAY_A ));
-				if ( ! empty( $missing_data )) {
-					$post = array_merge( $post, $missing_data );
+				$missing_data = $this->_do_wpdb_query('get_row', array('SELECT * FROM '.$table_to_query->get_table_name().' WHERE '.$table_to_query->get_fk_on_table().' = '.$post['ID'], ARRAY_A));
+				if ( ! empty($missing_data)) {
+					$post = array_merge($post, $missing_data);
 				}
 			} else {
 				return $this->get_one_by_ID($post['ID']);
@@ -417,15 +417,15 @@ 
 	 * @throws EE_Error
 	 * @return string
 	 */
-	public function post_type(){
+	public function post_type() {
 		$post_type_field = NULL;
-		foreach($this->field_settings(true) as $field_obj){
-			if($field_obj instanceof EE_WP_Post_Type_Field){
-				$post_type_field = $field_obj;break;
+		foreach ($this->field_settings(true) as $field_obj) {
+			if ($field_obj instanceof EE_WP_Post_Type_Field) {
+				$post_type_field = $field_obj; break;
 			}
 		}
-		if($post_type_field == NULL){
-			throw new EE_Error(sprintf(__("CPT Model %s should have a field of type EE_WP_Post_Type, but doesnt", "event_espresso"),get_class($this)));
+		if ($post_type_field == NULL) {
+			throw new EE_Error(sprintf(__("CPT Model %s should have a field of type EE_WP_Post_Type, but doesnt", "event_espresso"), get_class($this)));
 		}
 		return $post_type_field->get_default_value();
 	}

Braces +9 added lines, -7 removed lines

@@ -118,7 +118,7 @@ 
 		$field = $this->get_a_field_of_type('EE_WP_Post_Status_Field');
 		if($field){
 			return $field->get_name();
-		}else{
+		} else{
 			throw new EE_Error(sprintf(__('We are trying to find the post status flag field on %s, but none was found. Are you sure there is a field of type EE_Trashed_Flag_Field in %s constructor?','event_espresso'),get_class($this),get_class($this)));
 		}
 	}
@@ -193,14 +193,16 @@ 
 	public function get_meta_table_fields( $all = FALSE ) {
 		$all_fields = $fields_to_return = array();
 		foreach ( $this->_tables as $alias => $table_obj ) {
-			if ( $table_obj instanceof EE_Secondary_Table )
-				$all_fields = array_merge( $this->_get_fields_for_table($alias), $all_fields );
+			if ( $table_obj instanceof EE_Secondary_Table ) {
+							$all_fields = array_merge( $this->_get_fields_for_table($alias), $all_fields );
+			}
 		}
 
 		if ( !$all ) {
 			foreach ( $all_fields as $name => $obj ) {
-				if ( $obj instanceof EE_DB_Only_Field_Base )
-					continue;
+				if ( $obj instanceof EE_DB_Only_Field_Base ) {
+									continue;
+				}
 				$fields_to_return[] = $name;
 			}
 		} else {
@@ -248,7 +250,7 @@ 
 				'parent'=>$parent_term_taxonomy_id
 			));
 			$term_taxonomy->save();
-		}else{
+		} else{
 			$term_taxonomy->set_count($term_taxonomy->count() + 1);
 			$term_taxonomy->save();
 		}
@@ -366,7 +368,7 @@ 
 		if( ! $has_all_necessary_fields_for_table){
 
 			return $this->get_one_by_ID($post['ID']);
-		}else{
+		} else{
 			return $this->instantiate_class_from_array_or_object($post);
 		}
 	}