eventespresso / event-espresso-core

core/db_models/relations/EE_Has_Many_Revision_Relation.php

Spacing +7 added lines, -7 removed lines

@@ -190,7 +190,7 @@ 
         // k this is where things differ because NOW what we're going to do is get the PARENTS for the get all related (and we'll also start setting up the return_objs array containing related that DON'T have parent ids, for those that DON'T have parents to merge with our returned objects);
         foreach ($autosave_relations as $a_r) {
             $pid = $a_r->parent();
-            if (! empty($pid)) {
+            if ( ! empty($pid)) {
                 $parent_ids[] = $pid;
             } else {
                 $return_objs[] = $a_r;
@@ -206,9 +206,9 @@ 
         }
 
         // now we setup the query to get all the parents
-        if (! empty($parent_ids)) {
-            $query_param_where_this_model_pk                  = $this->get_this_model()->get_this_model_name() . "." . $this->get_this_model()->get_primary_key_field()->get_name();
-            $query_param[0][ $query_param_where_this_model_pk ] = array('IN', $parent_ids);
+        if ( ! empty($parent_ids)) {
+            $query_param_where_this_model_pk                  = $this->get_this_model()->get_this_model_name().".".$this->get_this_model()->get_primary_key_field()->get_name();
+            $query_param[0][$query_param_where_this_model_pk] = array('IN', $parent_ids);
             $parents                                          = $this->get_other_model()->get_all($query_params);
         }
 
@@ -243,7 +243,7 @@ 
             var_dump($this_obj);
             var_dump($other_obj);/**/
 
-            if (! empty($parent_evt_id) && $parent_evt_id == $other_obj->get($this->_primary_cpt_field)) {
+            if ( ! empty($parent_evt_id) && $parent_evt_id == $other_obj->get($this->_primary_cpt_field)) {
                 // let's do query on this objects model to see if the incoming pk value on the obj matches any parents in this objects table.
                 $has_parent_obj = $this->get_other_model()->get_one(array(
                     array(
@@ -259,7 +259,7 @@ 
                     $other_obj->set($pk_on_related_model, $has_parent_obj->ID());
                     $other_obj->set($this->_primary_cpt_field, $this_obj->ID());
 
-                    if (! $remove_relation) {
+                    if ( ! $remove_relation) {
                         $other_obj->save();
                         return array($other_obj);
                     } elseif ($remove_relation && ! $this->_blocking_delete) {
@@ -287,7 +287,7 @@ 
             // the last possible condition on a revision is that the incoming other_model object has a fk that == $this_obj pk which means we just return the $other obj and let it save as normal so we see the return at the bottom of this method.
         } else {
             // we only need to do the below IF this is not a remove relation
-            if (! $remove_relation) {
+            if ( ! $remove_relation) {
                 // okay this is is a normal update/save/remove so, let's make sure the other object is not a revision of the current object.
                 // the other object will likely NOT have the correct fk on it (which is the primary_cpt_field_mame) so we must retrieve from the db to get that first.
                 $existing_other_obj    = $this->get_other_model()->get_one_by_ID($other_obj->ID());

Indentation +296 added lines, -296 removed lines

@@ -10,303 +10,303 @@
  */
 class EE_Has_Many_Revision_Relation extends EE_Has_Many_Relation
 {
-    /**
-     * The Foreign key on the model that acts as the PRIMARY KEY used in special autosave handling where we query for
-     * autosaves (or the Foreign key on other models in relations pointing to this models primary key which is this
-     * value).  The _primary_cpt_field is what is equivalent to the post_id field on a cpt join.
-     *
-     * @var string
-     */
-    private $_primary_cpt_field;
-
-
-    /**
-     * This is what field serves as the "parent" column that is linked with whatever the main model's calling this
-     * relation has as a primary key.  In other words EEM_Event has 'Datetime' => new
-     * EE_Has_Many_Revision_Relation('EVT_ID', 'DTT_parent').  That means that in the EEM_Datetime model the
-     * 'DTT_Parent' field is related to the 'DTT_ID' primary key field (in the same model) because 'DTT_ID' is the
-     * primary key in the other model (EEM_Datetime).
-     *
-     * @var string
-     */
-    private $_parent_pk_relation_field;
-
-
-    /**
-     * Object representing the relationship between two models. Has_Many_Relations are where the OTHER model has the
-     * foreign key this model. IE, there can be many other model objects related to one of this model's objects (but
-     * NOT through a JOIN table, which is the case for EE_HABTM_Relations). This knows how to join the models, get
-     * related models across the relation, and add-and-remove the relationships.
-     *
-     * @param string  $primary_cpt_field             See property description for details
-     * @param string  $parent_pk_relation_field      This is the field that is "connected" to the $primary_cpt_field.
-     *                                               See property desc for details.
-     * @param boolean $block_deletes                 For this type of relation, we block by default. If there are
-     *                                               related models across this relation, block (prevent and add an
-     *                                               error) the deletion of this model
-     * @param string  $blocking_delete_error_message a customized error message on blocking deletes instead of the
-     *                                               default
-     */
-    public function __construct(
-        $primary_cpt_field,
-        $parent_pk_relation_field,
-        $block_deletes = true,
-        $blocking_delete_error_message = null
-    ) {
-        $this->_primary_cpt_field        = $primary_cpt_field;
-        $this->_parent_pk_relation_field = $parent_pk_relation_field;
-        parent::__construct($block_deletes, $blocking_delete_error_message);
-    }
-
-
-    /**
-     * Sets the other model object's foreign key to this model object's primary key. Feel free to do this manually if
-     * you like.
-     *
-     * @param EE_Base_Class|int $this_obj_or_id
-     * @param EE_Base_Class|int $other_obj_or_id
-     * @param array             $extra_join_model_fields_n_values
-     * @return \EE_Base_Class
-     * @throws \EE_Error
-     */
-    public function add_relation_to($this_obj_or_id, $other_obj_or_id, $extra_join_model_fields_n_values = array())
-    {
-        $this_model_obj  = $this->get_this_model()->ensure_is_obj($this_obj_or_id, true);
-        $other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id);
-
-        // handle possible revisions
-        $other_model_obj = $this->_check_for_revision($this_model_obj, $other_model_obj);
-
-        // if is array, then we've already done the add_relation so let's get out
-        if (is_array($other_model_obj)) {
-            return $other_model_obj[0];
-        }
-        // find the field on the other model which is a foreign key to this model
-        $fk_field_on_other_model = $this->get_other_model()->get_foreign_key_to($this->get_this_model()->get_this_model_name());
-        // set that field on the other model to this model's ID
-        $other_model_obj->set($fk_field_on_other_model->get_name(), $this_model_obj->ID());
-        $other_model_obj->save();
-        return $other_model_obj;
-    }
-
-
-    /**
-     * Sets the other model object's foreign key to its default, instead of pointing to this model object
-     *
-     * @param EE_Base_Class|int $this_obj_or_id
-     * @param EE_Base_Class|int $other_obj_or_id
-     * @param array             $where_query
-     * @return \EE_Base_Class
-     * @throws \EE_Error
-     */
-    public function remove_relation_to($this_obj_or_id, $other_obj_or_id, $where_query = array())
-    {
-        $this_model_obj  = $this->get_this_model()->ensure_is_obj($this_obj_or_id);
-        $other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id);
-        // handle possible revisions
-        $other_model_obj = $this->_check_for_revision($this_model_obj, $other_model_obj, true);
-
-
-        // if is array, then we've already done the add_relation so let's get out
-        if (is_array($other_model_obj)) {
-            return $other_model_obj[0];
-        }
-
-        // find the field on the other model which is a foreign key to this model
-        $fk_field_on_other_model = $this->get_other_model()->get_foreign_key_to($this->get_this_model()->get_this_model_name());
-
-
-        // set that field on the other model to this model's ID
-        if ($this->_blocking_delete) {
-            $other_model_obj->set($fk_field_on_other_model->get_name(), null, true);
-            $other_model_obj->save();
-        } else {
-            $other_model_obj->delete();
-            $other_model_obj->set($fk_field_on_other_model->get_name(), null, true);
-            return $other_model_obj;
-        }
-        return $other_model_obj;
-    }
-
-
-    /**
-     * This is identical to EE_Model_Relation->get_all_related() except we're going handle special autosave conditions
-     * in here.
-     *
-     * @param  EE_Base_Class|int $model_object_or_id
-     * @param  array             $query_params @see https://github.com/eventespresso/event-espresso-core/tree/master/docs/G--Model-System/model-query-params.md
-     * @param  boolean           $values_already_prepared_by_model_object @deprecated since 4.8.1
-     * @return EE_Base_Class[]
-     * @throws \EE_Error
-     */
-    public function get_all_related(
-        $model_object_or_id,
-        $query_params = array(),
-        $values_already_prepared_by_model_object = false
-    ) {
-        if ($values_already_prepared_by_model_object !== false) {
-            EE_Error::doing_it_wrong(
-                'EE_Model_Relation_Base::get_all_related',
-                esc_html__('The argument $values_already_prepared_by_model_object is no longer used.', 'event_espresso'),
-                '4.8.1'
-            );
-        }
-
-        // if this is an autosave then we're going to get things differently
-        if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
-            return $this->_do_autosave_get_all($model_object_or_id, $query_params);
-        }
-
-        return parent::get_all_related($model_object_or_id, $query_params);
-    }
-
-
-    /**
-     * If we're in the midst of an autosave then we're going to do things a bit differently than the usual
-     * get_all_related (commenting within).  For description of params see the get_all_related() comments
-     *
-     * @access protected
-     * @param      $model_object_or_id
-     * @param      $query_params
-     * @param bool $deprecated
-     * @return \EE_Base_Class[]
-     * @throws \EE_Error
-     */
-    protected function _do_autosave_get_all($model_object_or_id, $query_params, $deprecated = false)
-    {
-
-        // first we check if the post_id for the incoming query is for an autosave.  If it isn't that's what we want!
-        $model_object_id = $this->_get_model_object_id($model_object_or_id);
-
-        $autosave  = wp_get_post_autosave($model_object_id);
-        $id_to_use = $autosave ? $autosave->ID : $model_object_id;
-
-        $autosave_relations = parent::get_all_related($id_to_use, $query_params);
-        $parent_ids         = $parents = array();
-        $return_objs        = array();
-
-        // k this is where things differ because NOW what we're going to do is get the PARENTS for the get all related (and we'll also start setting up the return_objs array containing related that DON'T have parent ids, for those that DON'T have parents to merge with our returned objects);
-        foreach ($autosave_relations as $a_r) {
-            $pid = $a_r->parent();
-            if (! empty($pid)) {
-                $parent_ids[] = $pid;
-            } else {
-                $return_objs[] = $a_r;
-            }
-        }
-
-        // we have to make sure we also include the ORIGINAL values
-        $originals = parent::get_all_related($model_object_or_id, $query_params);
-
-        // merge $originals with $return_objs
-        if ($originals) {
-            $return_objs = array_merge($originals, $return_objs);
-        }
-
-        // now we setup the query to get all the parents
-        if (! empty($parent_ids)) {
-            $query_param_where_this_model_pk                  = $this->get_this_model()->get_this_model_name() . "." . $this->get_this_model()->get_primary_key_field()->get_name();
-            $query_param[0][ $query_param_where_this_model_pk ] = array('IN', $parent_ids);
-            $parents                                          = $this->get_other_model()->get_all($query_params);
-        }
-
-        // var_dump($parents);
-
-
-        // now merge parents with our current $return_objs and send back
-        return array_merge($parents, $return_objs);
-    }
-
-
-    /**
-     * Basically this method gets called to verify if the incoming object needs to be manipulated somewhat because it
-     * is a revision save.  If so, then we change things before sending back.  We also do verifications when this IS
-     * NOT an revision because we always need to make sure that the autosave/revision has parent recorded (which is
-     * sometime delayed if the object is created/saved first by the autosave)
-     *
-     * @param  EE_Base_Class $this_obj
-     * @param  EE_Base_Class $other_obj
-     * @param  boolean       $remove_relation Indicates whether we're doing a remove_relation or add_relation.
-     * @return EE_Base_Class. ($other_obj);
-     * @throws \EE_Error
-     */
-    protected function _check_for_revision($this_obj, $other_obj, $remove_relation = false)
-    {
-        $pk_on_related_model = $this->get_other_model()->get_primary_key_field()->get_name();
-        // now we need to determine if we're in a WP revision save cause if we are we need to do some special handling
-        if ($this_obj->post_type() === 'revision') {
-            // first if $other_obj fk = this_obj pk then we know that this is a pk object, let's make sure there is a matching set for the autosave if there is then we save over it, if there isn't then we need to create a new one.
-            $parent_evt_id = $this_obj->parent();
-            /*var_dump($parent_evt_id);
+	/**
+	 * The Foreign key on the model that acts as the PRIMARY KEY used in special autosave handling where we query for
+	 * autosaves (or the Foreign key on other models in relations pointing to this models primary key which is this
+	 * value).  The _primary_cpt_field is what is equivalent to the post_id field on a cpt join.
+	 *
+	 * @var string
+	 */
+	private $_primary_cpt_field;
+
+
+	/**
+	 * This is what field serves as the "parent" column that is linked with whatever the main model's calling this
+	 * relation has as a primary key.  In other words EEM_Event has 'Datetime' => new
+	 * EE_Has_Many_Revision_Relation('EVT_ID', 'DTT_parent').  That means that in the EEM_Datetime model the
+	 * 'DTT_Parent' field is related to the 'DTT_ID' primary key field (in the same model) because 'DTT_ID' is the
+	 * primary key in the other model (EEM_Datetime).
+	 *
+	 * @var string
+	 */
+	private $_parent_pk_relation_field;
+
+
+	/**
+	 * Object representing the relationship between two models. Has_Many_Relations are where the OTHER model has the
+	 * foreign key this model. IE, there can be many other model objects related to one of this model's objects (but
+	 * NOT through a JOIN table, which is the case for EE_HABTM_Relations). This knows how to join the models, get
+	 * related models across the relation, and add-and-remove the relationships.
+	 *
+	 * @param string  $primary_cpt_field             See property description for details
+	 * @param string  $parent_pk_relation_field      This is the field that is "connected" to the $primary_cpt_field.
+	 *                                               See property desc for details.
+	 * @param boolean $block_deletes                 For this type of relation, we block by default. If there are
+	 *                                               related models across this relation, block (prevent and add an
+	 *                                               error) the deletion of this model
+	 * @param string  $blocking_delete_error_message a customized error message on blocking deletes instead of the
+	 *                                               default
+	 */
+	public function __construct(
+		$primary_cpt_field,
+		$parent_pk_relation_field,
+		$block_deletes = true,
+		$blocking_delete_error_message = null
+	) {
+		$this->_primary_cpt_field        = $primary_cpt_field;
+		$this->_parent_pk_relation_field = $parent_pk_relation_field;
+		parent::__construct($block_deletes, $blocking_delete_error_message);
+	}
+
+
+	/**
+	 * Sets the other model object's foreign key to this model object's primary key. Feel free to do this manually if
+	 * you like.
+	 *
+	 * @param EE_Base_Class|int $this_obj_or_id
+	 * @param EE_Base_Class|int $other_obj_or_id
+	 * @param array             $extra_join_model_fields_n_values
+	 * @return \EE_Base_Class
+	 * @throws \EE_Error
+	 */
+	public function add_relation_to($this_obj_or_id, $other_obj_or_id, $extra_join_model_fields_n_values = array())
+	{
+		$this_model_obj  = $this->get_this_model()->ensure_is_obj($this_obj_or_id, true);
+		$other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id);
+
+		// handle possible revisions
+		$other_model_obj = $this->_check_for_revision($this_model_obj, $other_model_obj);
+
+		// if is array, then we've already done the add_relation so let's get out
+		if (is_array($other_model_obj)) {
+			return $other_model_obj[0];
+		}
+		// find the field on the other model which is a foreign key to this model
+		$fk_field_on_other_model = $this->get_other_model()->get_foreign_key_to($this->get_this_model()->get_this_model_name());
+		// set that field on the other model to this model's ID
+		$other_model_obj->set($fk_field_on_other_model->get_name(), $this_model_obj->ID());
+		$other_model_obj->save();
+		return $other_model_obj;
+	}
+
+
+	/**
+	 * Sets the other model object's foreign key to its default, instead of pointing to this model object
+	 *
+	 * @param EE_Base_Class|int $this_obj_or_id
+	 * @param EE_Base_Class|int $other_obj_or_id
+	 * @param array             $where_query
+	 * @return \EE_Base_Class
+	 * @throws \EE_Error
+	 */
+	public function remove_relation_to($this_obj_or_id, $other_obj_or_id, $where_query = array())
+	{
+		$this_model_obj  = $this->get_this_model()->ensure_is_obj($this_obj_or_id);
+		$other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id);
+		// handle possible revisions
+		$other_model_obj = $this->_check_for_revision($this_model_obj, $other_model_obj, true);
+
+
+		// if is array, then we've already done the add_relation so let's get out
+		if (is_array($other_model_obj)) {
+			return $other_model_obj[0];
+		}
+
+		// find the field on the other model which is a foreign key to this model
+		$fk_field_on_other_model = $this->get_other_model()->get_foreign_key_to($this->get_this_model()->get_this_model_name());
+
+
+		// set that field on the other model to this model's ID
+		if ($this->_blocking_delete) {
+			$other_model_obj->set($fk_field_on_other_model->get_name(), null, true);
+			$other_model_obj->save();
+		} else {
+			$other_model_obj->delete();
+			$other_model_obj->set($fk_field_on_other_model->get_name(), null, true);
+			return $other_model_obj;
+		}
+		return $other_model_obj;
+	}
+
+
+	/**
+	 * This is identical to EE_Model_Relation->get_all_related() except we're going handle special autosave conditions
+	 * in here.
+	 *
+	 * @param  EE_Base_Class|int $model_object_or_id
+	 * @param  array             $query_params @see https://github.com/eventespresso/event-espresso-core/tree/master/docs/G--Model-System/model-query-params.md
+	 * @param  boolean           $values_already_prepared_by_model_object @deprecated since 4.8.1
+	 * @return EE_Base_Class[]
+	 * @throws \EE_Error
+	 */
+	public function get_all_related(
+		$model_object_or_id,
+		$query_params = array(),
+		$values_already_prepared_by_model_object = false
+	) {
+		if ($values_already_prepared_by_model_object !== false) {
+			EE_Error::doing_it_wrong(
+				'EE_Model_Relation_Base::get_all_related',
+				esc_html__('The argument $values_already_prepared_by_model_object is no longer used.', 'event_espresso'),
+				'4.8.1'
+			);
+		}
+
+		// if this is an autosave then we're going to get things differently
+		if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE) {
+			return $this->_do_autosave_get_all($model_object_or_id, $query_params);
+		}
+
+		return parent::get_all_related($model_object_or_id, $query_params);
+	}
+
+
+	/**
+	 * If we're in the midst of an autosave then we're going to do things a bit differently than the usual
+	 * get_all_related (commenting within).  For description of params see the get_all_related() comments
+	 *
+	 * @access protected
+	 * @param      $model_object_or_id
+	 * @param      $query_params
+	 * @param bool $deprecated
+	 * @return \EE_Base_Class[]
+	 * @throws \EE_Error
+	 */
+	protected function _do_autosave_get_all($model_object_or_id, $query_params, $deprecated = false)
+	{
+
+		// first we check if the post_id for the incoming query is for an autosave.  If it isn't that's what we want!
+		$model_object_id = $this->_get_model_object_id($model_object_or_id);
+
+		$autosave  = wp_get_post_autosave($model_object_id);
+		$id_to_use = $autosave ? $autosave->ID : $model_object_id;
+
+		$autosave_relations = parent::get_all_related($id_to_use, $query_params);
+		$parent_ids         = $parents = array();
+		$return_objs        = array();
+
+		// k this is where things differ because NOW what we're going to do is get the PARENTS for the get all related (and we'll also start setting up the return_objs array containing related that DON'T have parent ids, for those that DON'T have parents to merge with our returned objects);
+		foreach ($autosave_relations as $a_r) {
+			$pid = $a_r->parent();
+			if (! empty($pid)) {
+				$parent_ids[] = $pid;
+			} else {
+				$return_objs[] = $a_r;
+			}
+		}
+
+		// we have to make sure we also include the ORIGINAL values
+		$originals = parent::get_all_related($model_object_or_id, $query_params);
+
+		// merge $originals with $return_objs
+		if ($originals) {
+			$return_objs = array_merge($originals, $return_objs);
+		}
+
+		// now we setup the query to get all the parents
+		if (! empty($parent_ids)) {
+			$query_param_where_this_model_pk                  = $this->get_this_model()->get_this_model_name() . "." . $this->get_this_model()->get_primary_key_field()->get_name();
+			$query_param[0][ $query_param_where_this_model_pk ] = array('IN', $parent_ids);
+			$parents                                          = $this->get_other_model()->get_all($query_params);
+		}
+
+		// var_dump($parents);
+
+
+		// now merge parents with our current $return_objs and send back
+		return array_merge($parents, $return_objs);
+	}
+
+
+	/**
+	 * Basically this method gets called to verify if the incoming object needs to be manipulated somewhat because it
+	 * is a revision save.  If so, then we change things before sending back.  We also do verifications when this IS
+	 * NOT an revision because we always need to make sure that the autosave/revision has parent recorded (which is
+	 * sometime delayed if the object is created/saved first by the autosave)
+	 *
+	 * @param  EE_Base_Class $this_obj
+	 * @param  EE_Base_Class $other_obj
+	 * @param  boolean       $remove_relation Indicates whether we're doing a remove_relation or add_relation.
+	 * @return EE_Base_Class. ($other_obj);
+	 * @throws \EE_Error
+	 */
+	protected function _check_for_revision($this_obj, $other_obj, $remove_relation = false)
+	{
+		$pk_on_related_model = $this->get_other_model()->get_primary_key_field()->get_name();
+		// now we need to determine if we're in a WP revision save cause if we are we need to do some special handling
+		if ($this_obj->post_type() === 'revision') {
+			// first if $other_obj fk = this_obj pk then we know that this is a pk object, let's make sure there is a matching set for the autosave if there is then we save over it, if there isn't then we need to create a new one.
+			$parent_evt_id = $this_obj->parent();
+			/*var_dump($parent_evt_id);
             var_dump($this_obj);
             var_dump($other_obj);/**/
 
-            if (! empty($parent_evt_id) && $parent_evt_id == $other_obj->get($this->_primary_cpt_field)) {
-                // let's do query on this objects model to see if the incoming pk value on the obj matches any parents in this objects table.
-                $has_parent_obj = $this->get_other_model()->get_one(array(
-                    array(
-                        $this->_parent_pk_relation_field => $other_obj->ID(),
-                        $this->_primary_cpt_field        => $this_obj->ID(),
-                    ),
-                ));
-
-                if ($has_parent_obj) {
-                    // this makes sure the update on the current obj happens to the revision's row NOT the parent row.
-
-                    $other_obj->set($this->_parent_pk_relation_field, $other_obj->ID());
-                    $other_obj->set($pk_on_related_model, $has_parent_obj->ID());
-                    $other_obj->set($this->_primary_cpt_field, $this_obj->ID());
-
-                    if (! $remove_relation) {
-                        $other_obj->save();
-                        return array($other_obj);
-                    } elseif ($remove_relation && ! $this->_blocking_delete) {
-                        $other_obj->delete();
-                        $other_obj->set($this->_parent_pk_relation_field, null, true);
-                        return array($other_obj);
-                    }
-                } else {
-                    $other_obj->set($this->_parent_pk_relation_field, $other_obj->ID());
-                    $other_obj->set($this->_primary_cpt_field, $this_obj->ID());
-                    $other_obj->set(
-                        $pk_on_related_model,
-                        null,
-                        true
-                    ); // ensure we create a new row for the autosave with parent id the same as the incoming ID.
-                    $other_obj->save(); // make sure we insert.
-                    return array($other_obj);
-                }
-            }
-
-            // var_dump('what makes it here');
-            // var_dump($other_obj);
-            // the next possible condition is that the incoming other_model obj has a NULL pk which means it just gets saved (which in turn creates it)
-
-            // the last possible condition on a revision is that the incoming other_model object has a fk that == $this_obj pk which means we just return the $other obj and let it save as normal so we see the return at the bottom of this method.
-        } else {
-            // we only need to do the below IF this is not a remove relation
-            if (! $remove_relation) {
-                // okay this is is a normal update/save/remove so, let's make sure the other object is not a revision of the current object.
-                // the other object will likely NOT have the correct fk on it (which is the primary_cpt_field_mame) so we must retrieve from the db to get that first.
-                $existing_other_obj    = $this->get_other_model()->get_one_by_ID($other_obj->ID());
-                $potential_revision_id = is_object($existing_other_obj) ? $existing_other_obj->get($this->_primary_cpt_field) : null;
-
-                if ($parent_this_obj_id = wp_is_post_revision($potential_revision_id)) {
-                    // yes the OTHER object is linked to the revision of the parent, not the parent itself. That means we need to make the other_object an attachment of this_obj and then duplicate other_obj for the revision.
-                    $other_obj->set($this->_primary_cpt_field, $this_obj->ID());
-                    $other_obj->save();
-
-                    // now create a new other_obj and fill with details from existing object
-                    $new_obj = $other_obj;
-                    $new_obj->set($this->_primary_cpt_field, $potential_revision_id);
-                    $new_obj->set($this->_parent_pk_relation_field, $other_obj->ID());
-                    $new_obj->set($pk_on_related_model, null);
-                    $new_obj->save();
-                    return array($new_obj);
-                }
-            }
-        }
-
-        return $other_obj;
-    }
+			if (! empty($parent_evt_id) && $parent_evt_id == $other_obj->get($this->_primary_cpt_field)) {
+				// let's do query on this objects model to see if the incoming pk value on the obj matches any parents in this objects table.
+				$has_parent_obj = $this->get_other_model()->get_one(array(
+					array(
+						$this->_parent_pk_relation_field => $other_obj->ID(),
+						$this->_primary_cpt_field        => $this_obj->ID(),
+					),
+				));
+
+				if ($has_parent_obj) {
+					// this makes sure the update on the current obj happens to the revision's row NOT the parent row.
+
+					$other_obj->set($this->_parent_pk_relation_field, $other_obj->ID());
+					$other_obj->set($pk_on_related_model, $has_parent_obj->ID());
+					$other_obj->set($this->_primary_cpt_field, $this_obj->ID());
+
+					if (! $remove_relation) {
+						$other_obj->save();
+						return array($other_obj);
+					} elseif ($remove_relation && ! $this->_blocking_delete) {
+						$other_obj->delete();
+						$other_obj->set($this->_parent_pk_relation_field, null, true);
+						return array($other_obj);
+					}
+				} else {
+					$other_obj->set($this->_parent_pk_relation_field, $other_obj->ID());
+					$other_obj->set($this->_primary_cpt_field, $this_obj->ID());
+					$other_obj->set(
+						$pk_on_related_model,
+						null,
+						true
+					); // ensure we create a new row for the autosave with parent id the same as the incoming ID.
+					$other_obj->save(); // make sure we insert.
+					return array($other_obj);
+				}
+			}
+
+			// var_dump('what makes it here');
+			// var_dump($other_obj);
+			// the next possible condition is that the incoming other_model obj has a NULL pk which means it just gets saved (which in turn creates it)
+
+			// the last possible condition on a revision is that the incoming other_model object has a fk that == $this_obj pk which means we just return the $other obj and let it save as normal so we see the return at the bottom of this method.
+		} else {
+			// we only need to do the below IF this is not a remove relation
+			if (! $remove_relation) {
+				// okay this is is a normal update/save/remove so, let's make sure the other object is not a revision of the current object.
+				// the other object will likely NOT have the correct fk on it (which is the primary_cpt_field_mame) so we must retrieve from the db to get that first.
+				$existing_other_obj    = $this->get_other_model()->get_one_by_ID($other_obj->ID());
+				$potential_revision_id = is_object($existing_other_obj) ? $existing_other_obj->get($this->_primary_cpt_field) : null;
+
+				if ($parent_this_obj_id = wp_is_post_revision($potential_revision_id)) {
+					// yes the OTHER object is linked to the revision of the parent, not the parent itself. That means we need to make the other_object an attachment of this_obj and then duplicate other_obj for the revision.
+					$other_obj->set($this->_primary_cpt_field, $this_obj->ID());
+					$other_obj->save();
+
+					// now create a new other_obj and fill with details from existing object
+					$new_obj = $other_obj;
+					$new_obj->set($this->_primary_cpt_field, $potential_revision_id);
+					$new_obj->set($this->_parent_pk_relation_field, $other_obj->ID());
+					$new_obj->set($pk_on_related_model, null);
+					$new_obj->save();
+					return array($new_obj);
+				}
+			}
+		}
+
+		return $other_obj;
+	}
 }

core/db_models/relations/EE_Has_Many_Any_Relation.php

Spacing +4 added lines, -4 removed lines

@@ -32,11 +32,11 @@ 
         $pk_table_alias        = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix(
             $model_relation_chain,
             $this->get_this_model()->get_this_model_name()
-        ) . $this_table_pk_field->get_table_alias();
-        $fk_table_alias        = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix(
+        ).$this_table_pk_field->get_table_alias();
+        $fk_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix(
             $model_relation_chain,
             $this->get_other_model()->get_this_model_name()
-        ) . $other_table_fk_field->get_table_alias();
+        ).$other_table_fk_field->get_table_alias();
         $fk_table              = $this->get_other_model()->get_table_for_alias($fk_table_alias);
         $field_with_model_name = $this->get_other_model()->get_field_containing_related_model_name();
 
@@ -46,7 +46,7 @@ 
             $other_table_fk_field->get_table_column(),
             $pk_table_alias,
             $this_table_pk_field->get_table_column(),
-            $fk_table_alias . '.' . $field_with_model_name->get_table_column() . "='" . $this->get_this_model()->get_this_model_name() . "'"
+            $fk_table_alias.'.'.$field_with_model_name->get_table_column()."='".$this->get_this_model()->get_this_model_name()."'"
         )
                . $this->get_other_model()->_construct_internal_join_to_table_with_alias($fk_table_alias);
     }

Indentation +84 added lines, -84 removed lines

@@ -14,94 +14,94 @@
  */
 class EE_Has_Many_Any_Relation extends EE_Has_Many_Relation
 {
-    /**
-     * Gets the SQL string for performing the join between this model and the other model.
-     *
-     * @param string $model_relation_chain like 'Event.Event_Venue.Venue'
-     * @return string of SQL, eg "LEFT JOIN table_name AS table_alias ON this_model_primary_table.pk =
-     *                other_model_primary_table.fk" etc
-     * @throws \EE_Error
-     */
-    public function get_join_statement($model_relation_chain)
-    {
-        // create the sql string like
-        // LEFT JOIN other_table AS table_alias ON this_table_alias.pk = other_table_alias.fk extra_join_conditions
-        $this_table_pk_field   = $this->get_this_model()->get_primary_key_field();
-        $other_table_fk_field  = $this->get_other_model()->get_foreign_key_to($this->get_this_model()->get_this_model_name());
-        $pk_table_alias        = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix(
-            $model_relation_chain,
-            $this->get_this_model()->get_this_model_name()
-        ) . $this_table_pk_field->get_table_alias();
-        $fk_table_alias        = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix(
-            $model_relation_chain,
-            $this->get_other_model()->get_this_model_name()
-        ) . $other_table_fk_field->get_table_alias();
-        $fk_table              = $this->get_other_model()->get_table_for_alias($fk_table_alias);
-        $field_with_model_name = $this->get_other_model()->get_field_containing_related_model_name();
+	/**
+	 * Gets the SQL string for performing the join between this model and the other model.
+	 *
+	 * @param string $model_relation_chain like 'Event.Event_Venue.Venue'
+	 * @return string of SQL, eg "LEFT JOIN table_name AS table_alias ON this_model_primary_table.pk =
+	 *                other_model_primary_table.fk" etc
+	 * @throws \EE_Error
+	 */
+	public function get_join_statement($model_relation_chain)
+	{
+		// create the sql string like
+		// LEFT JOIN other_table AS table_alias ON this_table_alias.pk = other_table_alias.fk extra_join_conditions
+		$this_table_pk_field   = $this->get_this_model()->get_primary_key_field();
+		$other_table_fk_field  = $this->get_other_model()->get_foreign_key_to($this->get_this_model()->get_this_model_name());
+		$pk_table_alias        = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix(
+			$model_relation_chain,
+			$this->get_this_model()->get_this_model_name()
+		) . $this_table_pk_field->get_table_alias();
+		$fk_table_alias        = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix(
+			$model_relation_chain,
+			$this->get_other_model()->get_this_model_name()
+		) . $other_table_fk_field->get_table_alias();
+		$fk_table              = $this->get_other_model()->get_table_for_alias($fk_table_alias);
+		$field_with_model_name = $this->get_other_model()->get_field_containing_related_model_name();
 
-        return $this->_left_join(
-            $fk_table,
-            $fk_table_alias,
-            $other_table_fk_field->get_table_column(),
-            $pk_table_alias,
-            $this_table_pk_field->get_table_column(),
-            $fk_table_alias . '.' . $field_with_model_name->get_table_column() . "='" . $this->get_this_model()->get_this_model_name() . "'"
-        )
-               . $this->get_other_model()->_construct_internal_join_to_table_with_alias($fk_table_alias);
-    }
+		return $this->_left_join(
+			$fk_table,
+			$fk_table_alias,
+			$other_table_fk_field->get_table_column(),
+			$pk_table_alias,
+			$this_table_pk_field->get_table_column(),
+			$fk_table_alias . '.' . $field_with_model_name->get_table_column() . "='" . $this->get_this_model()->get_this_model_name() . "'"
+		)
+			   . $this->get_other_model()->_construct_internal_join_to_table_with_alias($fk_table_alias);
+	}
 
 
-    /**
-     * Sets the other model object's foreign key to this model object's primary key. Feel free to do this manually if
-     * you like.
-     *
-     * @param EE_Base_Class|int $this_obj_or_id
-     * @param EE_Base_Class|int $other_obj_or_id
-     * @param array             $extra_join_model_fields_n_values
-     * @return \EE_Base_Class
-     * @throws \EE_Error
-     */
-    public function add_relation_to($this_obj_or_id, $other_obj_or_id, $extra_join_model_fields_n_values = array())
-    {
-        $this_model_obj  = $this->get_this_model()->ensure_is_obj($this_obj_or_id, true);
-        $other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id, true);
+	/**
+	 * Sets the other model object's foreign key to this model object's primary key. Feel free to do this manually if
+	 * you like.
+	 *
+	 * @param EE_Base_Class|int $this_obj_or_id
+	 * @param EE_Base_Class|int $other_obj_or_id
+	 * @param array             $extra_join_model_fields_n_values
+	 * @return \EE_Base_Class
+	 * @throws \EE_Error
+	 */
+	public function add_relation_to($this_obj_or_id, $other_obj_or_id, $extra_join_model_fields_n_values = array())
+	{
+		$this_model_obj  = $this->get_this_model()->ensure_is_obj($this_obj_or_id, true);
+		$other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id, true);
 
-        // find the field on the other model which is a foreign key to this model
-        $fk_field_on_other_model = $this->get_other_model()->get_foreign_key_to($this->get_this_model()->get_this_model_name());
-        // set that field on the other model to this model's ID
-        $other_model_obj->set($fk_field_on_other_model->get_name(), $this_model_obj->ID());
-        $other_model_obj->set(
-            $this->get_other_model()->get_field_containing_related_model_name()->get_name(),
-            $this->get_this_model()->get_this_model_name()
-        );
-        $other_model_obj->save();
-        return $other_model_obj;
-    }
+		// find the field on the other model which is a foreign key to this model
+		$fk_field_on_other_model = $this->get_other_model()->get_foreign_key_to($this->get_this_model()->get_this_model_name());
+		// set that field on the other model to this model's ID
+		$other_model_obj->set($fk_field_on_other_model->get_name(), $this_model_obj->ID());
+		$other_model_obj->set(
+			$this->get_other_model()->get_field_containing_related_model_name()->get_name(),
+			$this->get_this_model()->get_this_model_name()
+		);
+		$other_model_obj->save();
+		return $other_model_obj;
+	}
 
 
-    /**
-     * Sets the other model object's foreign key to its default, instead of pointing to this model object.
-     * If $other_obj_or_id doesn't have any other relations, this function is essentially orphaning it
-     *
-     * @param EE_Base_Class|int $this_obj_or_id
-     * @param EE_Base_Class|int $other_obj_or_id
-     * @param array             $where_query
-     * @return \EE_Base_Class
-     * @throws \EE_Error
-     */
-    public function remove_relation_to($this_obj_or_id, $other_obj_or_id, $where_query = array())
-    {
-        $other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id, true);
-        // find the field on the other model which is a foreign key to this model
-        $fk_field_on_other_model = $this->get_other_model()->get_foreign_key_to($this->get_this_model()->get_this_model_name());
-        // set that field on the other model to this model's ID
-        $other_model_obj->set($fk_field_on_other_model->get_name(), null, true);
-        $other_model_obj->set(
-            $this->get_other_model()->get_field_containing_related_model_name()->get_name(),
-            null,
-            true
-        );
-        $other_model_obj->save();
-        return $other_model_obj;
-    }
+	/**
+	 * Sets the other model object's foreign key to its default, instead of pointing to this model object.
+	 * If $other_obj_or_id doesn't have any other relations, this function is essentially orphaning it
+	 *
+	 * @param EE_Base_Class|int $this_obj_or_id
+	 * @param EE_Base_Class|int $other_obj_or_id
+	 * @param array             $where_query
+	 * @return \EE_Base_Class
+	 * @throws \EE_Error
+	 */
+	public function remove_relation_to($this_obj_or_id, $other_obj_or_id, $where_query = array())
+	{
+		$other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id, true);
+		// find the field on the other model which is a foreign key to this model
+		$fk_field_on_other_model = $this->get_other_model()->get_foreign_key_to($this->get_this_model()->get_this_model_name());
+		// set that field on the other model to this model's ID
+		$other_model_obj->set($fk_field_on_other_model->get_name(), null, true);
+		$other_model_obj->set(
+			$this->get_other_model()->get_field_containing_related_model_name()->get_name(),
+			null,
+			true
+		);
+		$other_model_obj->save();
+		return $other_model_obj;
+	}
 }

core/db_models/helpers/EE_Unique_Index.php

Indentation +1 added lines, -1 removed lines

@@ -6,5 +6,5 @@
  */
 class EE_Unique_Index extends EE_Index
 {
-    // yep, actually the same as index right now
+	// yep, actually the same as index right now
 }

core/db_models/helpers/EE_Primary_Key_Index.php

Indentation +1 added lines, -1 removed lines

@@ -6,5 +6,5 @@
  */
 class EE_Primary_Key_Index extends EE_Unique_Index
 {
-    // yep, actually the same as unique index right now
+	// yep, actually the same as unique index right now
 }

core/db_models/helpers/EE_Model_Query_Info_Carrier.php

Indentation +90 added lines, -90 removed lines

@@ -14,141 +14,141 @@ 
    /**
     * @var string SQL for performing joins (Eg, "INNER JOIN blah ON blah=blah INNER JOIN FOO ON foo=foo...")
     */
-    private $_join_sql;
+	private $_join_sql;
    /**
     *
     * @var array stating all the models that have been included thus far,so we don't get duplicates.
     * Keys are the model relation chains to them from the queried model
     * (eg, "Registration.Transaction.Payment"), and valuesare model names (eg "Payment")
     */
-    private $_models_included;
+	private $_models_included;
    
    /**
     * After we've acquired all the data types, we can create this sql.
     * @var string
     */
-    private $_where_sql;
+	private $_where_sql;
    /**
     * Full join sql. Eg, in a select query, that's everything after the "FROM", and before the "WHERE", so it includes
     * the declaration of the main model's tables, and then appends all the joining sql to other models
     * @var string
     */
-    private $_main_join_sql;
+	private $_main_join_sql;
    
    
-    private $_limit_sql;
+	private $_limit_sql;
    
-    private $_order_by_sql;
+	private $_order_by_sql;
    
-    private $_having_sql;
+	private $_having_sql;
    
-    private $_group_by_sql;
+	private $_group_by_sql;
    
-    public function set_limit_sql($limit_sql)
-    {
-        $this->_limit_sql = $limit_sql;
-    }
+	public function set_limit_sql($limit_sql)
+	{
+		$this->_limit_sql = $limit_sql;
+	}
     
-    public function set_order_by_sql($order_by_sql)
-    {
-        $this->_order_by_sql = $order_by_sql;
-    }
-    public function set_group_by_sql($group_by_sql)
-    {
-        $this->_group_by_sql = $group_by_sql;
-    }
-    public function set_having_sql($having_sql)
-    {
-        $this->_having_sql = $having_sql;
-    }
-    public function get_limit_sql()
-    {
-        return $this->_limit_sql;
-    }
-    public function get_order_by_sql()
-    {
-        return $this->_order_by_sql;
-    }
-    public function get_group_by_sql()
-    {
-        return $this->_group_by_sql;
-    }
-    public function get_having_sql()
-    {
-        return $this->_having_sql;
-    }
+	public function set_order_by_sql($order_by_sql)
+	{
+		$this->_order_by_sql = $order_by_sql;
+	}
+	public function set_group_by_sql($group_by_sql)
+	{
+		$this->_group_by_sql = $group_by_sql;
+	}
+	public function set_having_sql($having_sql)
+	{
+		$this->_having_sql = $having_sql;
+	}
+	public function get_limit_sql()
+	{
+		return $this->_limit_sql;
+	}
+	public function get_order_by_sql()
+	{
+		return $this->_order_by_sql;
+	}
+	public function get_group_by_sql()
+	{
+		return $this->_group_by_sql;
+	}
+	public function get_having_sql()
+	{
+		return $this->_having_sql;
+	}
    /**
     *
     * @param type $model_included_name
     * @param type $join_sql
     * @param type $data_types
     */
-    public function __construct($model_included_name = array(), $join_sql = '')
-    {
-        $this->_models_included = $model_included_name;
-        $this->_join_sql = $join_sql;
-    }
+	public function __construct($model_included_name = array(), $join_sql = '')
+	{
+		$this->_models_included = $model_included_name;
+		$this->_join_sql = $join_sql;
+	}
    
    /**
     * Merges info from the other EEM_Related_Model_Info_Carrier into this one.
     * @param EE_Model_Query_Info_Carrier $other_model_query_info_carrier
     */
-    public function merge($other_model_query_info_carrier)
-    {
-        if ($other_model_query_info_carrier && ! $this->_have_already_included_one_of_these_models($other_model_query_info_carrier->get_model_names_included())) {
-            $model_included_on_other_join_sql_and_data_types_carrier =  $other_model_query_info_carrier->get_model_names_included();
-            $this->_models_included = array_merge($this->_models_included, $model_included_on_other_join_sql_and_data_types_carrier);
-            $this->_join_sql .= $other_model_query_info_carrier->_join_sql;
-        }
-        // otherwise don't merge our data.
-        // yes, this means that we must immediately merge any model data into our grand list
-        // as soon as we get some from ONE model, or else we could reject a EEM_Related_Model_Info_Carrier
-        // which is carrying info from two models WHERE one is already included but the other is NOT
-    }
+	public function merge($other_model_query_info_carrier)
+	{
+		if ($other_model_query_info_carrier && ! $this->_have_already_included_one_of_these_models($other_model_query_info_carrier->get_model_names_included())) {
+			$model_included_on_other_join_sql_and_data_types_carrier =  $other_model_query_info_carrier->get_model_names_included();
+			$this->_models_included = array_merge($this->_models_included, $model_included_on_other_join_sql_and_data_types_carrier);
+			$this->_join_sql .= $other_model_query_info_carrier->_join_sql;
+		}
+		// otherwise don't merge our data.
+		// yes, this means that we must immediately merge any model data into our grand list
+		// as soon as we get some from ONE model, or else we could reject a EEM_Related_Model_Info_Carrier
+		// which is carrying info from two models WHERE one is already included but the other is NOT
+	}
    /**
     * Checks whether or not we have already included all the models mentione din $model_names on the query info varrier
     * @param array $model_names just like EE_MOdel_QUery_Info_Carrier::_models_included: keys are model chain paths, values are the model names only
     * @return boolean
     */
-    protected function _have_already_included_one_of_these_models($model_names)
-    {
-        foreach ($this->_models_included as $model_relation_path => $model_included) {
-            if (array_key_exists($model_relation_path, $model_names)) {
-                return true;
-            }
-        }
-        return false;
-    }
+	protected function _have_already_included_one_of_these_models($model_names)
+	{
+		foreach ($this->_models_included as $model_relation_path => $model_included) {
+			if (array_key_exists($model_relation_path, $model_names)) {
+				return true;
+			}
+		}
+		return false;
+	}
    /**
     * Array keys are model names, values are "model relation paths". See EE_Model_Query_Info_Carrier::_models_included for details
     * @return array like EE_Model_Query_Info_Carrier::_models_included
     */
-    public function get_model_names_included()
-    {
-        return $this->_models_included;
-    }
+	public function get_model_names_included()
+	{
+		return $this->_models_included;
+	}
    /**
     * sets the $where_sql for later use from client code
     * @param string $where_sql
     */
-    public function set_where_sql($where_sql)
-    {
-        $this->_where_sql = $where_sql;
-    }
-    public function get_where_sql()
-    {
-        return $this->_where_sql;
-    }
+	public function set_where_sql($where_sql)
+	{
+		$this->_where_sql = $where_sql;
+	}
+	public function get_where_sql()
+	{
+		return $this->_where_sql;
+	}
 
    /**
     * Gets the SQL for joining the main model to other models involves in the query, which was set earlier on
     * the EE_Model_Query_info_Carrier by calling set_main_model_join_sql()
     * @return string
     */
-    public function get_main_model_join_sql()
-    {
-        return $this->_main_join_sql;
-    }
+	public function get_main_model_join_sql()
+	{
+		return $this->_main_join_sql;
+	}
 
 
    /**
@@ -158,12 +158,12 @@ 
     * after the FROM and before the WHERE.)
     * @param string $join_sql
     */
-    public function set_main_model_join_sql($join_sql)
-    {
-        $this->_main_join_sql = $join_sql;
-    }
-    public function get_full_join_sql()
-    {
-        return $this->_main_join_sql . $this->_join_sql;
-    }
+	public function set_main_model_join_sql($join_sql)
+	{
+		$this->_main_join_sql = $join_sql;
+	}
+	public function get_full_join_sql()
+	{
+		return $this->_main_join_sql . $this->_join_sql;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -96,7 +96,7 @@ 
     public function merge($other_model_query_info_carrier)
     {
         if ($other_model_query_info_carrier && ! $this->_have_already_included_one_of_these_models($other_model_query_info_carrier->get_model_names_included())) {
-            $model_included_on_other_join_sql_and_data_types_carrier =  $other_model_query_info_carrier->get_model_names_included();
+            $model_included_on_other_join_sql_and_data_types_carrier = $other_model_query_info_carrier->get_model_names_included();
             $this->_models_included = array_merge($this->_models_included, $model_included_on_other_join_sql_and_data_types_carrier);
             $this->_join_sql .= $other_model_query_info_carrier->_join_sql;
         }
@@ -164,6 +164,6 @@ 
     }
     public function get_full_join_sql()
     {
-        return $this->_main_join_sql . $this->_join_sql;
+        return $this->_main_join_sql.$this->_join_sql;
     }
 }

core/helpers/EEH_Formatter.helper.php

Spacing +2 added lines, -2 removed lines

@@ -46,7 +46,7 @@ 
             return htmlspecialchars($string);
         } else {
             if ($translate === false) {
-                return self::ee_tep_parse_input_field_data($string, array( '"' => '"' ));
+                return self::ee_tep_parse_input_field_data($string, array('"' => '"'));
             } else {
                 return self::ee_tep_parse_input_field_data($string, $translate);
             }
@@ -84,7 +84,7 @@ 
                 return false;
             }
         } else {
-            if (( $value !== '' ) && ( strtolower($value) !== 'null' ) && ( strlen(trim($value)) > 0 )) {
+            if (($value !== '') && (strtolower($value) !== 'null') && (strlen(trim($value)) > 0)) {
                 return true;
             } else {
                 return false;

Indentation +92 added lines, -92 removed lines

@@ -10,108 +10,108 @@
  */
 class EEH_Formatter
 {
-    /**
-     * _admin_format_content
-     * Text formatting function for wp_editor.
-     * This should fix all of the formatting issues of text output from the database.
-     *
-     * @static
-     * @access public
-     * @param  string $content content to format
-     * @return string          formatted content
-     */
-    public static function admin_format_content($content = '')
-    {
-        return wpautop(stripslashes_deep(html_entity_decode($content, ENT_QUOTES, "UTF-8")));
-    }
+	/**
+	 * _admin_format_content
+	 * Text formatting function for wp_editor.
+	 * This should fix all of the formatting issues of text output from the database.
+	 *
+	 * @static
+	 * @access public
+	 * @param  string $content content to format
+	 * @return string          formatted content
+	 */
+	public static function admin_format_content($content = '')
+	{
+		return wpautop(stripslashes_deep(html_entity_decode($content, ENT_QUOTES, "UTF-8")));
+	}
 
 
 
-    /**
-     * ee_tep_output_string
-     * todo: we need a description for this.
-     *
-     * @static
-     * @access public
-     * @param  string  $string    string to handle
-     * @param  boolean $translate //todo what is this for?
-     * @param  boolean $protected true then we run htmlspecialchars and return
-     * @return string
-     */
-    public static function ee_tep_output_string($string, $translate = false, $protected = false)
-    {
-        if ($protected === true) {
-            return htmlspecialchars($string);
-        } else {
-            if ($translate === false) {
-                return self::ee_tep_parse_input_field_data($string, array( '"' => '"' ));
-            } else {
-                return self::ee_tep_parse_input_field_data($string, $translate);
-            }
-        }
-    }
+	/**
+	 * ee_tep_output_string
+	 * todo: we need a description for this.
+	 *
+	 * @static
+	 * @access public
+	 * @param  string  $string    string to handle
+	 * @param  boolean $translate //todo what is this for?
+	 * @param  boolean $protected true then we run htmlspecialchars and return
+	 * @return string
+	 */
+	public static function ee_tep_output_string($string, $translate = false, $protected = false)
+	{
+		if ($protected === true) {
+			return htmlspecialchars($string);
+		} else {
+			if ($translate === false) {
+				return self::ee_tep_parse_input_field_data($string, array( '"' => '"' ));
+			} else {
+				return self::ee_tep_parse_input_field_data($string, $translate);
+			}
+		}
+	}
 
 
 
-    /**
-     * ee_tep_parse_input_field_data
-     *
-     * @param  string $data string to be "translated"
-     * @param         array ] $parse array in the form array( 'from' => 'to', ... )
-     * @return string
-     */
-    public static function ee_tep_parse_input_field_data($data, $parse)
-    {
-        return strtr(trim($data), $parse);
-    }
+	/**
+	 * ee_tep_parse_input_field_data
+	 *
+	 * @param  string $data string to be "translated"
+	 * @param         array ] $parse array in the form array( 'from' => 'to', ... )
+	 * @return string
+	 */
+	public static function ee_tep_parse_input_field_data($data, $parse)
+	{
+		return strtr(trim($data), $parse);
+	}
 
 
 
-    /**
-     * [ee_tep_not_null description]
-     *
-     * @param  string | array $value [description]
-     * @return bool       [description]
-     */
-    public static function ee_tep_not_null($value)
-    {
-        if (is_array($value)) {
-            if (count($value) > 0) {
-                return true;
-            } else {
-                return false;
-            }
-        } else {
-            if (( $value !== '' ) && ( strtolower($value) !== 'null' ) && ( strlen(trim($value)) > 0 )) {
-                return true;
-            } else {
-                return false;
-            }
-        }
-    }
+	/**
+	 * [ee_tep_not_null description]
+	 *
+	 * @param  string | array $value [description]
+	 * @return bool       [description]
+	 */
+	public static function ee_tep_not_null($value)
+	{
+		if (is_array($value)) {
+			if (count($value) > 0) {
+				return true;
+			} else {
+				return false;
+			}
+		} else {
+			if (( $value !== '' ) && ( strtolower($value) !== 'null' ) && ( strlen(trim($value)) > 0 )) {
+				return true;
+			} else {
+				return false;
+			}
+		}
+	}
 
 
 
-    /**
-     * Formats a date
-     *
-     * @param string $date
-     * @param string $format - format for the date
-     * @deprecated 4.6.12  Note, a search revealed this was not used anywhere in core or in our
-     *                       addons at time of writing this.  So just deprecated in case of third party use.
-     * @return string
-     * @deprecated v4.6.21
-     */
-    public static function event_date_display($date, $format = '')
-    {
-        EE_Error::doing_it_wrong(
-            __METHOD__,
-            esc_html__(
-                'This method is deprecated as of EE 4.6.12.  Currently it does not reformat as with prior behaviour but just returns the incoming string.  Please use the EE_Datetime helpers for Datetime on the event to display as desired.',
-                'event_espresso'
-            ),
-            '4.6.21'
-        );
-        return $date;
-    }
+	/**
+	 * Formats a date
+	 *
+	 * @param string $date
+	 * @param string $format - format for the date
+	 * @deprecated 4.6.12  Note, a search revealed this was not used anywhere in core or in our
+	 *                       addons at time of writing this.  So just deprecated in case of third party use.
+	 * @return string
+	 * @deprecated v4.6.21
+	 */
+	public static function event_date_display($date, $format = '')
+	{
+		EE_Error::doing_it_wrong(
+			__METHOD__,
+			esc_html__(
+				'This method is deprecated as of EE 4.6.12.  Currently it does not reformat as with prior behaviour but just returns the incoming string.  Please use the EE_Datetime helpers for Datetime on the event to display as desired.',
+				'event_espresso'
+			),
+			'4.6.21'
+		);
+		return $date;
+	}
 }

core/CPTs/EE_CPT_Default_Strategy.core.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
      */
     public function pre_get_posts(WP_Query $WP_Query)
     {
-        if (! $WP_Query->is_main_query() && ! $WP_Query->is_archive()) {
+        if ( ! $WP_Query->is_main_query() && ! $WP_Query->is_archive()) {
             return $WP_Query;
         }
         return $WP_Query;

Indentation +58 added lines, -58 removed lines

@@ -11,70 +11,70 @@
  */
 class EE_CPT_Default_Strategy
 {
-    /**
-     * $CPT - the current page, if it utilizes CPTs
-     *
-     * @var    object
-     * @access    protected
-     */
-    protected $CPT = null;
+	/**
+	 * $CPT - the current page, if it utilizes CPTs
+	 *
+	 * @var    object
+	 * @access    protected
+	 */
+	protected $CPT = null;
 
 
-    /**
-     *    class constructor
-     *
-     * @access    private
-     * @param    array $arguments
-     * @return    \EE_CPT_Default_Strategy
-     */
-    public function __construct($arguments = array())
-    {
-        $this->CPT = isset($arguments['CPT']) ? $arguments['CPT'] : null;
-    }
+	/**
+	 *    class constructor
+	 *
+	 * @access    private
+	 * @param    array $arguments
+	 * @return    \EE_CPT_Default_Strategy
+	 */
+	public function __construct($arguments = array())
+	{
+		$this->CPT = isset($arguments['CPT']) ? $arguments['CPT'] : null;
+	}
 
 
-    /**
-     *    pre_get_posts
-     *
-     * @access    public
-     * @param    \WP_Query $WP_Query
-     * @return    \WP_Query
-     */
-    public function pre_get_posts(WP_Query $WP_Query)
-    {
-        if (! $WP_Query->is_main_query() && ! $WP_Query->is_archive()) {
-            return $WP_Query;
-        }
-        return $WP_Query;
-    }
+	/**
+	 *    pre_get_posts
+	 *
+	 * @access    public
+	 * @param    \WP_Query $WP_Query
+	 * @return    \WP_Query
+	 */
+	public function pre_get_posts(WP_Query $WP_Query)
+	{
+		if (! $WP_Query->is_main_query() && ! $WP_Query->is_archive()) {
+			return $WP_Query;
+		}
+		return $WP_Query;
+	}
 
 
-    /**
-     *    wp
-     *
-     * @access    public
-     * @param    \WP_Post[] $posts
-     * @param    \WP_Query  $WP_Query
-     * @return    \WP_Post[]
-     */
-    public function the_posts($posts, WP_Query $WP_Query)
-    {
-        return $posts;
-    }
+	/**
+	 *    wp
+	 *
+	 * @access    public
+	 * @param    \WP_Post[] $posts
+	 * @param    \WP_Query  $WP_Query
+	 * @return    \WP_Post[]
+	 */
+	public function the_posts($posts, WP_Query $WP_Query)
+	{
+		return $posts;
+	}
 
 
-    /**
-     *    get_EE_post_type_metadata
-     *
-     * @access    public
-     * @param mixed     $meta_value
-     * @param    int    $post_id
-     * @param    string $meta_key
-     * @param    string $single
-     * @return    mixed
-     */
-    public function get_EE_post_type_metadata($meta_value = null, $post_id, $meta_key, $single)
-    {
-        return $meta_value;
-    }
+	/**
+	 *    get_EE_post_type_metadata
+	 *
+	 * @access    public
+	 * @param mixed     $meta_value
+	 * @param    int    $post_id
+	 * @param    string $meta_key
+	 * @param    string $single
+	 * @return    mixed
+	 */
+	public function get_EE_post_type_metadata($meta_value = null, $post_id, $meta_key, $single)
+	{
+		return $meta_value;
+	}
 }

modules/invalid_checkout_access/EED_Invalid_Checkout_Access.module.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
      */
     public static function getInvalidCheckoutAccess()
     {
-        if (! self::$invalid_checkout_access_form instanceof InvalidCheckoutAccess) {
+        if ( ! self::$invalid_checkout_access_form instanceof InvalidCheckoutAccess) {
             self::$invalid_checkout_access_form = new InvalidCheckoutAccess();
         }
         return self::$invalid_checkout_access_form;

Indentation +69 added lines, -69 removed lines

@@ -13,84 +13,84 @@
  */
 class EED_Invalid_Checkout_Access extends EED_Module
 {
-    /**
-     * @var InvalidCheckoutAccess $invalid_checkout_access_form
-     */
-    private static $invalid_checkout_access_form;
+	/**
+	 * @var InvalidCheckoutAccess $invalid_checkout_access_form
+	 */
+	private static $invalid_checkout_access_form;
 
-    /**
-     * set_hooks - for hooking into EE Core, other modules, etc
-     */
-    public static function set_hooks()
-    {
-    }
+	/**
+	 * set_hooks - for hooking into EE Core, other modules, etc
+	 */
+	public static function set_hooks()
+	{
+	}
 
 
-    /**
-     * set_hooks_admin - for hooking into EE Admin Core, other modules, etc
-     */
-    public static function set_hooks_admin()
-    {
-        add_action(
-            'AHEE__Extend_Registration_Form_Admin_Page___reg_form_settings_template',
-            array('EED_Invalid_Checkout_Access', 'display_invalid_checkout_access_form'),
-            15
-        );
-        add_filter(
-            'FHEE__Extend_Registration_Form_Admin_Page___update_reg_form_settings__CFG_registration',
-            array('EED_Invalid_Checkout_Access', 'process_invalid_checkout_access_form')
-        );
-    }
+	/**
+	 * set_hooks_admin - for hooking into EE Admin Core, other modules, etc
+	 */
+	public static function set_hooks_admin()
+	{
+		add_action(
+			'AHEE__Extend_Registration_Form_Admin_Page___reg_form_settings_template',
+			array('EED_Invalid_Checkout_Access', 'display_invalid_checkout_access_form'),
+			15
+		);
+		add_filter(
+			'FHEE__Extend_Registration_Form_Admin_Page___update_reg_form_settings__CFG_registration',
+			array('EED_Invalid_Checkout_Access', 'process_invalid_checkout_access_form')
+		);
+	}
 
 
-    /**
-     * run - initial module setup
-     * this method is primarily used for activating resources in the EE_Front_Controller thru the use of filters
-     *
-     * @var WP $WP
-     */
-    public function run($WP)
-    {
-        // TODO: Implement run() method.
-    }
+	/**
+	 * run - initial module setup
+	 * this method is primarily used for activating resources in the EE_Front_Controller thru the use of filters
+	 *
+	 * @var WP $WP
+	 */
+	public function run($WP)
+	{
+		// TODO: Implement run() method.
+	}
 
 
-    /**
-     * @return InvalidCheckoutAccess
-     */
-    public static function getInvalidCheckoutAccess()
-    {
-        if (! self::$invalid_checkout_access_form instanceof InvalidCheckoutAccess) {
-            self::$invalid_checkout_access_form = new InvalidCheckoutAccess();
-        }
-        return self::$invalid_checkout_access_form;
-    }
+	/**
+	 * @return InvalidCheckoutAccess
+	 */
+	public static function getInvalidCheckoutAccess()
+	{
+		if (! self::$invalid_checkout_access_form instanceof InvalidCheckoutAccess) {
+			self::$invalid_checkout_access_form = new InvalidCheckoutAccess();
+		}
+		return self::$invalid_checkout_access_form;
+	}
 
 
-    /**
-     * email_validation_settings_form
-     *
-     * @return    void
-     * @throws EE_Error
-     */
-    public static function display_invalid_checkout_access_form()
-    {
-        $invalid_checkout_access_form = EED_Invalid_Checkout_Access::getInvalidCheckoutAccess();
-        echo wp_kses($invalid_checkout_access_form->getForm()->get_html(), AllowedTags::getWithFormTags());
-    }
+	/**
+	 * email_validation_settings_form
+	 *
+	 * @return    void
+	 * @throws EE_Error
+	 */
+	public static function display_invalid_checkout_access_form()
+	{
+		$invalid_checkout_access_form = EED_Invalid_Checkout_Access::getInvalidCheckoutAccess();
+		echo wp_kses($invalid_checkout_access_form->getForm()->get_html(), AllowedTags::getWithFormTags());
+	}
 
 
-    /**
-     * email_validation_settings_form
-     *
-     * @param EE_Registration_Config $EE_Registration_Config
-     * @return EE_Registration_Config
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function process_invalid_checkout_access_form(EE_Registration_Config $EE_Registration_Config)
-    {
-        $invalid_checkout_access_form = EED_Invalid_Checkout_Access::getInvalidCheckoutAccess();
-        return $invalid_checkout_access_form->processForm($EE_Registration_Config);
-    }
+	/**
+	 * email_validation_settings_form
+	 *
+	 * @param EE_Registration_Config $EE_Registration_Config
+	 * @return EE_Registration_Config
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function process_invalid_checkout_access_form(EE_Registration_Config $EE_Registration_Config)
+	{
+		$invalid_checkout_access_form = EED_Invalid_Checkout_Access::getInvalidCheckoutAccess();
+		return $invalid_checkout_access_form->processForm($EE_Registration_Config);
+	}
 }

payment_methods/Paypal_Standard/templates/paypal_standard_intro.template.php

Indentation +7 added lines, -7 removed lines

@@ -3,13 +3,13 @@
 // if this is decaf, which is put on WordPress.org, we need to inform users that
 // we just put an affiliate link there. See https://developer.wordpress.org/plugins/wordpress-org/detailed-plugin-guidelines/ section 12
 if (apply_filters('FHEE__ee_show_affiliate_links', true)) {
-    $closing_tag .= esc_html__(' (affiliate link)', 'event_espresso');
+	$closing_tag .= esc_html__(' (affiliate link)', 'event_espresso');
 }
 printf(
-    esc_html__(
-        'PayPal Standard (PayPal Payments Standard) is an off-site payment method and is available to event organizers in many countries. A PayPal premier or business account is needed to accept payments. Need a PayPal account? Call 1-855-456-1338 or %1$sclick here to sign up for a merchant account%2$s.',
-        'event_espresso'
-    ),
-    '<a href="https://eventespresso.com/go/paypalstandard/" target="_blank">',
-    $closing_tag
+	esc_html__(
+		'PayPal Standard (PayPal Payments Standard) is an off-site payment method and is available to event organizers in many countries. A PayPal premier or business account is needed to accept payments. Need a PayPal account? Call 1-855-456-1338 or %1$sclick here to sign up for a merchant account%2$s.',
+		'event_espresso'
+	),
+	'<a href="https://eventespresso.com/go/paypalstandard/" target="_blank">',
+	$closing_tag
 );