eventespresso / event-espresso-core

core/db_models/fields/EE_Trashed_Flag_Field.php

Indentation +2 added lines, -2 removed lines

@@ -2,6 +2,6 @@
 
 class EE_Trashed_Flag_Field extends EE_Boolean_Field
 {
-    // note: some client code simply checks if a field IS an EE_Trashed_Flag_Field
-    // ...otherwise, these fields are mostly the same as boolean fields
+	// note: some client code simply checks if a field IS an EE_Trashed_Flag_Field
+	// ...otherwise, these fields are mostly the same as boolean fields
 }

core/db_models/fields/EE_Integer_Field.php

Indentation +19 added lines, -19 removed lines

@@ -6,26 +6,26 @@
  */
 class EE_Integer_Field extends EE_Model_Field_Base
 {
-    /**
-     * @param string $table_column
-     * @param string $nicename
-     * @param bool   $nullable
-     * @param null   $default_value
-     */
-    public function __construct($table_column, $nicename, $nullable, $default_value = null)
-    {
-        parent::__construct($table_column, $nicename, $nullable, $default_value);
-        $this->setSchemaType('integer');
-    }
+	/**
+	 * @param string $table_column
+	 * @param string $nicename
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 */
+	public function __construct($table_column, $nicename, $nullable, $default_value = null)
+	{
+		parent::__construct($table_column, $nicename, $nullable, $default_value);
+		$this->setSchemaType('integer');
+	}
 
 
-    public function prepare_for_set($value_inputted_for_field_on_model_object)
-    {
-        return intval($value_inputted_for_field_on_model_object);
-    }
+	public function prepare_for_set($value_inputted_for_field_on_model_object)
+	{
+		return intval($value_inputted_for_field_on_model_object);
+	}
 
-    public function prepare_for_set_from_db($value_inputted_for_field_on_model_object)
-    {
-        return intval($value_inputted_for_field_on_model_object);
-    }
+	public function prepare_for_set_from_db($value_inputted_for_field_on_model_object)
+	{
+		return intval($value_inputted_for_field_on_model_object);
+	}
 }

core/db_models/fields/EE_Primary_Key_Field_Base.php

Indentation +19 added lines, -19 removed lines

@@ -2,24 +2,24 @@
 
 abstract class EE_Primary_Key_Field_Base extends EE_Field_With_Model_Name
 {
-    /**
-     * Overrides parent so it doesn't need to provide so many non-applicable fields
-     *
-     * @param string $table_column
-     * @param string $nicename
-     */
-    public function __construct($table_column, $nicename, $default)
-    {
-        parent::__construct($table_column, $nicename, false, $default, null);
-    }
+	/**
+	 * Overrides parent so it doesn't need to provide so many non-applicable fields
+	 *
+	 * @param string $table_column
+	 * @param string $nicename
+	 */
+	public function __construct($table_column, $nicename, $default)
+	{
+		parent::__construct($table_column, $nicename, false, $default, null);
+	}
 
-    /**
-     * @param $table_alias
-     * @param $name
-     */
-    public function _construct_finalize($table_alias, $name, $model_name)
-    {
-        $this->_model_name_pointed_to = $model_name;
-        parent::_construct_finalize($table_alias, $name, $model_name);
-    }
+	/**
+	 * @param $table_alias
+	 * @param $name
+	 */
+	public function _construct_finalize($table_alias, $name, $model_name)
+	{
+		$this->_model_name_pointed_to = $model_name;
+		parent::_construct_finalize($table_alias, $name, $model_name);
+	}
 }

core/db_models/fields/EE_DB_Only_Int_Field.php

Indentation +11 added lines, -11 removed lines

@@ -2,15 +2,15 @@
 
 class EE_DB_Only_Int_Field extends EE_DB_Only_Field_Base
 {
-    /**
-     * @param string $table_column
-     * @param string $nicename
-     * @param bool   $nullable
-     * @param null   $default_value
-     */
-    public function __construct($table_column, $nicename, $nullable, $default_value = null)
-    {
-        parent::__construct($table_column, $nicename, $nullable, $default_value);
-        $this->setSchemaType('integer');
-    }
+	/**
+	 * @param string $table_column
+	 * @param string $nicename
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 */
+	public function __construct($table_column, $nicename, $nullable, $default_value = null)
+	{
+		parent::__construct($table_column, $nicename, $nullable, $default_value);
+		$this->setSchemaType('integer');
+	}
 }

core/db_models/fields/EE_Enum_Integer_Field.php

Spacing +2 added lines, -2 removed lines

@@ -89,8 +89,8 @@
     public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
     {
         $options = $this->_allowed_enum_values();
-        if (isset($options[ $value_on_field_to_be_outputted ])) {
-            return $options[ $value_on_field_to_be_outputted ];
+        if (isset($options[$value_on_field_to_be_outputted])) {
+            return $options[$value_on_field_to_be_outputted];
         } else {
             return $value_on_field_to_be_outputted;
         }

Indentation +102 added lines, -102 removed lines

@@ -9,115 +9,115 @@
  */
 class EE_Enum_Integer_Field extends EE_Integer_Field
 {
-    /**
-     * @var array $_allowed_enum_values
-     */
-    public $_allowed_enum_values;
+	/**
+	 * @var array $_allowed_enum_values
+	 */
+	public $_allowed_enum_values;
 
 
-    /**
-     * @param string  $table_column
-     * @param string  $nicename
-     * @param boolean $nullable
-     * @param int     $default_value
-     * @param array   $allowed_enum_values keys are values to be used in the DB, values are how they should be displayed
-     */
-    public function __construct($table_column, $nicename, $nullable, $default_value, $allowed_enum_values)
-    {
-        $this->_allowed_enum_values = $allowed_enum_values;
-        parent::__construct($table_column, $nicename, $nullable, $default_value);
-        $this->setSchemaType('object');
-    }
+	/**
+	 * @param string  $table_column
+	 * @param string  $nicename
+	 * @param boolean $nullable
+	 * @param int     $default_value
+	 * @param array   $allowed_enum_values keys are values to be used in the DB, values are how they should be displayed
+	 */
+	public function __construct($table_column, $nicename, $nullable, $default_value, $allowed_enum_values)
+	{
+		$this->_allowed_enum_values = $allowed_enum_values;
+		parent::__construct($table_column, $nicename, $nullable, $default_value);
+		$this->setSchemaType('object');
+	}
 
-    /**
-     * Returns the list of allowed enum options, but filterable.
-     * This is used internally
-     *
-     * @return array
-     */
-    protected function _allowed_enum_values()
-    {
-        return (array) apply_filters(
-            'FHEE__EE_Enum_Integer_Field___allowed_enum_options',
-            $this->_allowed_enum_values,
-            $this
-        );
-    }
+	/**
+	 * Returns the list of allowed enum options, but filterable.
+	 * This is used internally
+	 *
+	 * @return array
+	 */
+	protected function _allowed_enum_values()
+	{
+		return (array) apply_filters(
+			'FHEE__EE_Enum_Integer_Field___allowed_enum_options',
+			$this->_allowed_enum_values,
+			$this
+		);
+	}
 
-    /**
-     * When setting, just verify that the value being used matches what we've defined as allowable enum values.
-     * If not, throw an error (but if WP_DEBUG is false, just set the value to default)
-     *
-     * @param int $value_inputted_for_field_on_model_object
-     * @return int
-     * @throws EE_Error
-     */
-    public function prepare_for_set($value_inputted_for_field_on_model_object)
-    {
-        $allowed_enum_values = $this->_allowed_enum_values();
-        if (
-            $value_inputted_for_field_on_model_object !== null
-            && ! array_key_exists($value_inputted_for_field_on_model_object, $allowed_enum_values)
-        ) {
-            if (defined('WP_DEBUG') && WP_DEBUG) {
-                $msg = sprintf(
-                    esc_html__('System is assigning incompatible value "%1$s" to field "%2$s"', 'event_espresso'),
-                    $value_inputted_for_field_on_model_object,
-                    $this->_name
-                );
-                $msg2 = sprintf(
-                    esc_html__('Allowed values for "%1$s" are "%2$s". You provided "%3$s"', 'event_espresso'),
-                    $this->_name,
-                    implode(', ', array_keys($allowed_enum_values)),
-                    $value_inputted_for_field_on_model_object
-                );
-                EE_Error::add_error("{$msg}||{$msg2}", __FILE__, __FUNCTION__, __LINE__);
-            }
-            return $this->get_default_value();
-        }
-        return (int) $value_inputted_for_field_on_model_object;
-    }
+	/**
+	 * When setting, just verify that the value being used matches what we've defined as allowable enum values.
+	 * If not, throw an error (but if WP_DEBUG is false, just set the value to default)
+	 *
+	 * @param int $value_inputted_for_field_on_model_object
+	 * @return int
+	 * @throws EE_Error
+	 */
+	public function prepare_for_set($value_inputted_for_field_on_model_object)
+	{
+		$allowed_enum_values = $this->_allowed_enum_values();
+		if (
+			$value_inputted_for_field_on_model_object !== null
+			&& ! array_key_exists($value_inputted_for_field_on_model_object, $allowed_enum_values)
+		) {
+			if (defined('WP_DEBUG') && WP_DEBUG) {
+				$msg = sprintf(
+					esc_html__('System is assigning incompatible value "%1$s" to field "%2$s"', 'event_espresso'),
+					$value_inputted_for_field_on_model_object,
+					$this->_name
+				);
+				$msg2 = sprintf(
+					esc_html__('Allowed values for "%1$s" are "%2$s". You provided "%3$s"', 'event_espresso'),
+					$this->_name,
+					implode(', ', array_keys($allowed_enum_values)),
+					$value_inputted_for_field_on_model_object
+				);
+				EE_Error::add_error("{$msg}||{$msg2}", __FILE__, __FUNCTION__, __LINE__);
+			}
+			return $this->get_default_value();
+		}
+		return (int) $value_inputted_for_field_on_model_object;
+	}
 
 
 
-    /**
-     * Gets the pretty version of the enum's value.
-     *
-     * @param int | string $value_on_field_to_be_outputted
-     * @param null         $schema
-     * @return string
-     */
-    public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
-    {
-        $options = $this->_allowed_enum_values();
-        if (isset($options[ $value_on_field_to_be_outputted ])) {
-            return $options[ $value_on_field_to_be_outputted ];
-        } else {
-            return $value_on_field_to_be_outputted;
-        }
-    }
+	/**
+	 * Gets the pretty version of the enum's value.
+	 *
+	 * @param int | string $value_on_field_to_be_outputted
+	 * @param null         $schema
+	 * @return string
+	 */
+	public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
+	{
+		$options = $this->_allowed_enum_values();
+		if (isset($options[ $value_on_field_to_be_outputted ])) {
+			return $options[ $value_on_field_to_be_outputted ];
+		} else {
+			return $value_on_field_to_be_outputted;
+		}
+	}
 
 
-    public function getSchemaProperties()
-    {
-        return array(
-            'raw' => array(
-                'description' =>  sprintf(
-                    esc_html__('%s - the value in the database.', 'event_espresso'),
-                    $this->get_nicename()
-                ),
-                'enum' => array_keys($this->_allowed_enum_values()),
-                'type' => 'integer'
-            ),
-            'pretty' => array(
-                'description' =>  sprintf(
-                    esc_html__('%s - the value for display.', 'event_espresso'),
-                    $this->get_nicename()
-                ),
-                'enum' => array_values($this->_allowed_enum_values()),
-                'type' => 'string',
-                'read_only' => true
-            )
-        );
-    }
+	public function getSchemaProperties()
+	{
+		return array(
+			'raw' => array(
+				'description' =>  sprintf(
+					esc_html__('%s - the value in the database.', 'event_espresso'),
+					$this->get_nicename()
+				),
+				'enum' => array_keys($this->_allowed_enum_values()),
+				'type' => 'integer'
+			),
+			'pretty' => array(
+				'description' =>  sprintf(
+					esc_html__('%s - the value for display.', 'event_espresso'),
+					$this->get_nicename()
+				),
+				'enum' => array_values($this->_allowed_enum_values()),
+				'type' => 'string',
+				'read_only' => true
+			)
+		);
+	}
 }

core/db_models/fields/EE_Maybe_Serialized_Text_Field.php

Indentation +31 added lines, -31 removed lines

@@ -2,36 +2,36 @@
 
 class EE_Maybe_Serialized_Text_Field extends EE_Serialized_Text_Field
 {
-    /**
-     * Value could be an array or a string. If its an array, serialize it. Otherwise, leave it as a string
-     *
-     * @param array|string $value_of_field_on_model_object
-     * @return string (possibly serialized)
-     */
-    public function prepare_for_use_in_db($value_of_field_on_model_object)
-    {
-        if (is_array($value_of_field_on_model_object)) {
-            return parent::prepare_for_use_in_db($value_of_field_on_model_object);
-        } else {
-            return $value_of_field_on_model_object;
-        }
-    }
+	/**
+	 * Value could be an array or a string. If its an array, serialize it. Otherwise, leave it as a string
+	 *
+	 * @param array|string $value_of_field_on_model_object
+	 * @return string (possibly serialized)
+	 */
+	public function prepare_for_use_in_db($value_of_field_on_model_object)
+	{
+		if (is_array($value_of_field_on_model_object)) {
+			return parent::prepare_for_use_in_db($value_of_field_on_model_object);
+		} else {
+			return $value_of_field_on_model_object;
+		}
+	}
 
-    /**
-     * Formats the array (or string) according to $schema. Right now, just implode with commas
-     *
-     * @param type $value_on_field_to_be_outputted
-     * @param type $schema
-     * @return strubg
-     */
-    public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
-    {
-        $pretty_value = null;
-        if (is_array($value_on_field_to_be_outputted)) {
-            $pretty_value = parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema);
-        } else {
-            $pretty_value = $value_on_field_to_be_outputted;
-        }
-        return $pretty_value;
-    }
+	/**
+	 * Formats the array (or string) according to $schema. Right now, just implode with commas
+	 *
+	 * @param type $value_on_field_to_be_outputted
+	 * @param type $schema
+	 * @return strubg
+	 */
+	public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
+	{
+		$pretty_value = null;
+		if (is_array($value_on_field_to_be_outputted)) {
+			$pretty_value = parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema);
+		} else {
+			$pretty_value = $value_on_field_to_be_outputted;
+		}
+		return $pretty_value;
+	}
 }

core/db_models/fields/EE_Post_Content_Field.php

Spacing +3 added lines, -3 removed lines

@@ -28,7 +28,7 @@ 
      */
     public function prepare_for_set($value)
     {
-        if (! current_user_can('unfiltered_html')) {
+        if ( ! current_user_can('unfiltered_html')) {
             $value = wp_kses("$value", wp_kses_allowed_html('post'));
         }
         return parent::prepare_for_set($value);
@@ -96,8 +96,8 @@ 
      */
     protected static function _setup_the_content_wp_core_only_filters()
     {
-        add_filter('the_content_wp_core_only', array( $GLOBALS['wp_embed'], 'run_shortcode'), 8);
-        add_filter('the_content_wp_core_only', array( $GLOBALS['wp_embed'], 'autoembed'), 8);
+        add_filter('the_content_wp_core_only', array($GLOBALS['wp_embed'], 'run_shortcode'), 8);
+        add_filter('the_content_wp_core_only', array($GLOBALS['wp_embed'], 'autoembed'), 8);
         add_filter('the_content_wp_core_only', 'wptexturize', 10);
         add_filter('the_content_wp_core_only', 'wpautop', 10);
         add_filter('the_content_wp_core_only', 'shortcode_unautop', 10);

Indentation +114 added lines, -114 removed lines

@@ -6,129 +6,129 @@
  */
 class EE_Post_Content_Field extends EE_Text_Field_Base
 {
-    /**
-     * @param string $table_column
-     * @param string $nicename
-     * @param bool   $nullable
-     * @param null   $default_value
-     */
-    public function __construct($table_column, $nicename, $nullable, $default_value = null)
-    {
-        parent::__construct($table_column, $nicename, $nullable, $default_value);
-        $this->setSchemaType('object');
-    }
+	/**
+	 * @param string $table_column
+	 * @param string $nicename
+	 * @param bool   $nullable
+	 * @param null   $default_value
+	 */
+	public function __construct($table_column, $nicename, $nullable, $default_value = null)
+	{
+		parent::__construct($table_column, $nicename, $nullable, $default_value);
+		$this->setSchemaType('object');
+	}
 
 
-    /**
-     * removes all tags which a WP Post wouldn't allow in its content normally
-     *
-     * @param string $value
-     * @return string
-     */
-    public function prepare_for_set($value)
-    {
-        if (! current_user_can('unfiltered_html')) {
-            $value = wp_kses("$value", wp_kses_allowed_html('post'));
-        }
-        return parent::prepare_for_set($value);
-    }
+	/**
+	 * removes all tags which a WP Post wouldn't allow in its content normally
+	 *
+	 * @param string $value
+	 * @return string
+	 */
+	public function prepare_for_set($value)
+	{
+		if (! current_user_can('unfiltered_html')) {
+			$value = wp_kses("$value", wp_kses_allowed_html('post'));
+		}
+		return parent::prepare_for_set($value);
+	}
 
 
 
-    /**
-     * Runs the content through `the_content`, or if prepares the content for placing in a form input
-     * @param string $value_on_field_to_be_outputted
-     * @param string   $schema possible values: 'form_input' or null (if null, will run through 'the_content')
-     * @return string
-     * @throws EE_Error when WP_DEBUG is on and recursive calling is detected
-     */
-    public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
-    {
-        switch ($schema) {
-            case 'form_input':
-                return parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema);
-            case 'the_content':
-                if (doing_filter('the_content')) {
-                    if (defined('WP_DEBUG') && WP_DEBUG) {
-                        throw new EE_Error(
-                            sprintf(
-                                esc_html__('You have recursively called "%1$s" with %2$s set to %3$s which uses "%2$s" filter. You should use it with %2$s "%3$s" instead here.', 'event_espresso'),
-                                'EE_Post_Content_Field::prepare_for_pretty_echoing',
-                                '$schema',
-                                'the_content',
-                                'the_content_wp_core_only'
-                            )
-                        );
-                    } else {
-                        return $this->prepare_for_pretty_echoing($value_on_field_to_be_outputted, 'the_content_wp_core_only');
-                    }
-                }
-                return apply_filters(
-                    'the_content',
-                    parent::prepare_for_pretty_echoing(
-                        $value_on_field_to_be_outputted,
-                        $schema
-                    )
-                );
-            case 'the_content_wp_core_only':
-            default:
-                self::_setup_the_content_wp_core_only_filters();
-                $return_value = apply_filters(
-                    'the_content_wp_core_only',
-                    parent::prepare_for_pretty_echoing(
-                        $value_on_field_to_be_outputted,
-                        $schema
-                    )
-                );
-                // ya know what? adding these filters is super fast. Let's just
-                // avoid needing to maintain global state and set this up as-needed
-                remove_all_filters('the_content_wp_core_only');
-                do_action('AHEE__EE_Post_Content_Field__prepare_for_pretty_echoing__the_content_wp_core_only__done');
-                return $return_value;
-        }
-    }
+	/**
+	 * Runs the content through `the_content`, or if prepares the content for placing in a form input
+	 * @param string $value_on_field_to_be_outputted
+	 * @param string   $schema possible values: 'form_input' or null (if null, will run through 'the_content')
+	 * @return string
+	 * @throws EE_Error when WP_DEBUG is on and recursive calling is detected
+	 */
+	public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
+	{
+		switch ($schema) {
+			case 'form_input':
+				return parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema);
+			case 'the_content':
+				if (doing_filter('the_content')) {
+					if (defined('WP_DEBUG') && WP_DEBUG) {
+						throw new EE_Error(
+							sprintf(
+								esc_html__('You have recursively called "%1$s" with %2$s set to %3$s which uses "%2$s" filter. You should use it with %2$s "%3$s" instead here.', 'event_espresso'),
+								'EE_Post_Content_Field::prepare_for_pretty_echoing',
+								'$schema',
+								'the_content',
+								'the_content_wp_core_only'
+							)
+						);
+					} else {
+						return $this->prepare_for_pretty_echoing($value_on_field_to_be_outputted, 'the_content_wp_core_only');
+					}
+				}
+				return apply_filters(
+					'the_content',
+					parent::prepare_for_pretty_echoing(
+						$value_on_field_to_be_outputted,
+						$schema
+					)
+				);
+			case 'the_content_wp_core_only':
+			default:
+				self::_setup_the_content_wp_core_only_filters();
+				$return_value = apply_filters(
+					'the_content_wp_core_only',
+					parent::prepare_for_pretty_echoing(
+						$value_on_field_to_be_outputted,
+						$schema
+					)
+				);
+				// ya know what? adding these filters is super fast. Let's just
+				// avoid needing to maintain global state and set this up as-needed
+				remove_all_filters('the_content_wp_core_only');
+				do_action('AHEE__EE_Post_Content_Field__prepare_for_pretty_echoing__the_content_wp_core_only__done');
+				return $return_value;
+		}
+	}
 
 
 
-    /**
-     * Verifies we've setup the standard WP core filters on  'the_content_wp_core_only' filter
-     */
-    protected static function _setup_the_content_wp_core_only_filters()
-    {
-        add_filter('the_content_wp_core_only', array( $GLOBALS['wp_embed'], 'run_shortcode'), 8);
-        add_filter('the_content_wp_core_only', array( $GLOBALS['wp_embed'], 'autoembed'), 8);
-        add_filter('the_content_wp_core_only', 'wptexturize', 10);
-        add_filter('the_content_wp_core_only', 'wpautop', 10);
-        add_filter('the_content_wp_core_only', 'shortcode_unautop', 10);
-        add_filter('the_content_wp_core_only', 'prepend_attachment', 10);
-        if (function_exists('wp_filter_content_tags')) {
-            add_filter('the_content_wp_core_only', 'wp_filter_content_tags', 10);
-        } elseif (function_exists('wp_make_content_images_responsive')) {
-            add_filter('the_content_wp_core_only', 'wp_make_content_images_responsive', 10);
-        }
-        add_filter('the_content_wp_core_only', 'do_shortcode', 11);
-        add_filter('the_content_wp_core_only', 'convert_smilies', 20);
-    }
+	/**
+	 * Verifies we've setup the standard WP core filters on  'the_content_wp_core_only' filter
+	 */
+	protected static function _setup_the_content_wp_core_only_filters()
+	{
+		add_filter('the_content_wp_core_only', array( $GLOBALS['wp_embed'], 'run_shortcode'), 8);
+		add_filter('the_content_wp_core_only', array( $GLOBALS['wp_embed'], 'autoembed'), 8);
+		add_filter('the_content_wp_core_only', 'wptexturize', 10);
+		add_filter('the_content_wp_core_only', 'wpautop', 10);
+		add_filter('the_content_wp_core_only', 'shortcode_unautop', 10);
+		add_filter('the_content_wp_core_only', 'prepend_attachment', 10);
+		if (function_exists('wp_filter_content_tags')) {
+			add_filter('the_content_wp_core_only', 'wp_filter_content_tags', 10);
+		} elseif (function_exists('wp_make_content_images_responsive')) {
+			add_filter('the_content_wp_core_only', 'wp_make_content_images_responsive', 10);
+		}
+		add_filter('the_content_wp_core_only', 'do_shortcode', 11);
+		add_filter('the_content_wp_core_only', 'convert_smilies', 20);
+	}
 
 
 
-    public function getSchemaProperties()
-    {
-        return array(
-            'raw' => array(
-                'description' =>  sprintf(
-                    esc_html__('%s - the content as it exists in the database.', 'event_espresso'),
-                    $this->get_nicename()
-                ),
-                'type' => 'string'
-            ),
-            'rendered' => array(
-                'description' =>  sprintf(
-                    esc_html__('%s - the content rendered for display.', 'event_espresso'),
-                    $this->get_nicename()
-                ),
-                'type' => 'string'
-            )
-        );
-    }
+	public function getSchemaProperties()
+	{
+		return array(
+			'raw' => array(
+				'description' =>  sprintf(
+					esc_html__('%s - the content as it exists in the database.', 'event_espresso'),
+					$this->get_nicename()
+				),
+				'type' => 'string'
+			),
+			'rendered' => array(
+				'description' =>  sprintf(
+					esc_html__('%s - the content rendered for display.', 'event_espresso'),
+					$this->get_nicename()
+				),
+				'type' => 'string'
+			)
+		);
+	}
 }

core/db_models/fields/EE_Maybe_Serialized_Simple_HTML_Field.php

Indentation +51 added lines, -51 removed lines

@@ -11,59 +11,59 @@
  */
 class EE_Maybe_Serialized_Simple_HTML_Field extends EE_Maybe_Serialized_Text_Field
 {
-    /**
-     * removes all non-basic tags when setting
-     *
-     * @param string $value_inputted_for_field_on_model_object
-     * @return string
-     */
-    public function prepare_for_set($value_inputted_for_field_on_model_object)
-    {
-        return parent::prepare_for_set($this->_remove_tags($value_inputted_for_field_on_model_object));
-    }
+	/**
+	 * removes all non-basic tags when setting
+	 *
+	 * @param string $value_inputted_for_field_on_model_object
+	 * @return string
+	 */
+	public function prepare_for_set($value_inputted_for_field_on_model_object)
+	{
+		return parent::prepare_for_set($this->_remove_tags($value_inputted_for_field_on_model_object));
+	}
 
-    /**
-     * Remove any non-"simple" html tags. @see EE_Simple_HTML_Field
-     *
-     * @param array|string $value
-     * @return array|string
-     */
-    protected function _remove_tags($value)
-    {
-        if (is_array($value)) {
-            foreach ($value as $key => $v) {
-                $value[ $key ] = $this->_remove_tags($v);
-            }
-        } elseif (is_string($value)) {
-            $value = wp_kses("$value", $this->_get_allowed_tags());
-        }
-        return $value;
-    }
+	/**
+	 * Remove any non-"simple" html tags. @see EE_Simple_HTML_Field
+	 *
+	 * @param array|string $value
+	 * @return array|string
+	 */
+	protected function _remove_tags($value)
+	{
+		if (is_array($value)) {
+			foreach ($value as $key => $v) {
+				$value[ $key ] = $this->_remove_tags($v);
+			}
+		} elseif (is_string($value)) {
+			$value = wp_kses("$value", $this->_get_allowed_tags());
+		}
+		return $value;
+	}
 
-    /**
-     * In case unsafe data somehow got inserted into the database, we want to remove tags again
-     *
-     * @param array|string $value_found_in_db_for_model_object
-     * @return array|string
-     */
-    public function prepare_for_set_from_db($value_found_in_db_for_model_object)
-    {
-        return $this->_remove_tags(parent::prepare_for_set_from_db($value_found_in_db_for_model_object));
-    }
+	/**
+	 * In case unsafe data somehow got inserted into the database, we want to remove tags again
+	 *
+	 * @param array|string $value_found_in_db_for_model_object
+	 * @return array|string
+	 */
+	public function prepare_for_set_from_db($value_found_in_db_for_model_object)
+	{
+		return $this->_remove_tags(parent::prepare_for_set_from_db($value_found_in_db_for_model_object));
+	}
 
 
-    /**
-     * Determines what tags to allow in this model field
-     *
-     * @global array $allowedtags
-     * @return array
-     */
-    public function _get_allowed_tags()
-    {
-        return apply_filters(
-            'FHEE__EE_Maybe_Serialized_Simple_HTML_Field___get_allowed_tags',
-            EEH_HTML::get_simple_tags(),
-            $this
-        );
-    }
+	/**
+	 * Determines what tags to allow in this model field
+	 *
+	 * @global array $allowedtags
+	 * @return array
+	 */
+	public function _get_allowed_tags()
+	{
+		return apply_filters(
+			'FHEE__EE_Maybe_Serialized_Simple_HTML_Field___get_allowed_tags',
+			EEH_HTML::get_simple_tags(),
+			$this
+		);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
     {
         if (is_array($value)) {
             foreach ($value as $key => $v) {
-                $value[ $key ] = $this->_remove_tags($v);
+                $value[$key] = $this->_remove_tags($v);
             }
         } elseif (is_string($value)) {
             $value = wp_kses("$value", $this->_get_allowed_tags());

core/db_models/fields/EE_Foreign_Key_String_Field.php

Indentation +13 added lines, -13 removed lines

@@ -3,17 +3,17 @@
 class EE_Foreign_Key_String_Field extends EE_Foreign_Key_Field_Base
 {
 
-    /**
-     * removes all tags when setting
-     *
-     * @param string $value_inputted_for_field_on_model_object
-     * @return string
-     */
-    public function prepare_for_set($value_inputted_for_field_on_model_object)
-    {
-        if ($this->is_model_obj_of_type_pointed_to($value_inputted_for_field_on_model_object)) {
-            $value_inputted_for_field_on_model_object = $value_inputted_for_field_on_model_object->ID();
-        }
-        return strtoupper(wp_strip_all_tags($value_inputted_for_field_on_model_object));
-    }
+	/**
+	 * removes all tags when setting
+	 *
+	 * @param string $value_inputted_for_field_on_model_object
+	 * @return string
+	 */
+	public function prepare_for_set($value_inputted_for_field_on_model_object)
+	{
+		if ($this->is_model_obj_of_type_pointed_to($value_inputted_for_field_on_model_object)) {
+			$value_inputted_for_field_on_model_object = $value_inputted_for_field_on_model_object->ID();
+		}
+		return strtoupper(wp_strip_all_tags($value_inputted_for_field_on_model_object));
+	}
 }