Completed
Branch ADMIN-REFRESH (093308)
by
unknown
02:56 queued 27s
created
core/db_models/fields/EE_DB_Only_Int_Field.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -2,15 +2,15 @@
 block discarded – undo
2 2
 
3 3
 class EE_DB_Only_Int_Field extends EE_DB_Only_Field_Base
4 4
 {
5
-    /**
6
-     * @param string $table_column
7
-     * @param string $nicename
8
-     * @param bool   $nullable
9
-     * @param null   $default_value
10
-     */
11
-    public function __construct($table_column, $nicename, $nullable, $default_value = null)
12
-    {
13
-        parent::__construct($table_column, $nicename, $nullable, $default_value);
14
-        $this->setSchemaType('integer');
15
-    }
5
+	/**
6
+	 * @param string $table_column
7
+	 * @param string $nicename
8
+	 * @param bool   $nullable
9
+	 * @param null   $default_value
10
+	 */
11
+	public function __construct($table_column, $nicename, $nullable, $default_value = null)
12
+	{
13
+		parent::__construct($table_column, $nicename, $nullable, $default_value);
14
+		$this->setSchemaType('integer');
15
+	}
16 16
 }
Please login to merge, or discard this patch.
core/db_models/fields/EE_Enum_Integer_Field.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -89,8 +89,8 @@
 block discarded – undo
89 89
     public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
90 90
     {
91 91
         $options = $this->_allowed_enum_values();
92
-        if (isset($options[ $value_on_field_to_be_outputted ])) {
93
-            return $options[ $value_on_field_to_be_outputted ];
92
+        if (isset($options[$value_on_field_to_be_outputted])) {
93
+            return $options[$value_on_field_to_be_outputted];
94 94
         } else {
95 95
             return $value_on_field_to_be_outputted;
96 96
         }
Please login to merge, or discard this patch.
Indentation   +102 added lines, -102 removed lines patch added patch discarded remove patch
@@ -9,115 +9,115 @@
 block discarded – undo
9 9
  */
10 10
 class EE_Enum_Integer_Field extends EE_Integer_Field
11 11
 {
12
-    /**
13
-     * @var array $_allowed_enum_values
14
-     */
15
-    public $_allowed_enum_values;
12
+	/**
13
+	 * @var array $_allowed_enum_values
14
+	 */
15
+	public $_allowed_enum_values;
16 16
 
17 17
 
18
-    /**
19
-     * @param string  $table_column
20
-     * @param string  $nicename
21
-     * @param boolean $nullable
22
-     * @param int     $default_value
23
-     * @param array   $allowed_enum_values keys are values to be used in the DB, values are how they should be displayed
24
-     */
25
-    public function __construct($table_column, $nicename, $nullable, $default_value, $allowed_enum_values)
26
-    {
27
-        $this->_allowed_enum_values = $allowed_enum_values;
28
-        parent::__construct($table_column, $nicename, $nullable, $default_value);
29
-        $this->setSchemaType('object');
30
-    }
18
+	/**
19
+	 * @param string  $table_column
20
+	 * @param string  $nicename
21
+	 * @param boolean $nullable
22
+	 * @param int     $default_value
23
+	 * @param array   $allowed_enum_values keys are values to be used in the DB, values are how they should be displayed
24
+	 */
25
+	public function __construct($table_column, $nicename, $nullable, $default_value, $allowed_enum_values)
26
+	{
27
+		$this->_allowed_enum_values = $allowed_enum_values;
28
+		parent::__construct($table_column, $nicename, $nullable, $default_value);
29
+		$this->setSchemaType('object');
30
+	}
31 31
 
32
-    /**
33
-     * Returns the list of allowed enum options, but filterable.
34
-     * This is used internally
35
-     *
36
-     * @return array
37
-     */
38
-    protected function _allowed_enum_values()
39
-    {
40
-        return (array) apply_filters(
41
-            'FHEE__EE_Enum_Integer_Field___allowed_enum_options',
42
-            $this->_allowed_enum_values,
43
-            $this
44
-        );
45
-    }
32
+	/**
33
+	 * Returns the list of allowed enum options, but filterable.
34
+	 * This is used internally
35
+	 *
36
+	 * @return array
37
+	 */
38
+	protected function _allowed_enum_values()
39
+	{
40
+		return (array) apply_filters(
41
+			'FHEE__EE_Enum_Integer_Field___allowed_enum_options',
42
+			$this->_allowed_enum_values,
43
+			$this
44
+		);
45
+	}
46 46
 
47
-    /**
48
-     * When setting, just verify that the value being used matches what we've defined as allowable enum values.
49
-     * If not, throw an error (but if WP_DEBUG is false, just set the value to default)
50
-     *
51
-     * @param int $value_inputted_for_field_on_model_object
52
-     * @return int
53
-     * @throws EE_Error
54
-     */
55
-    public function prepare_for_set($value_inputted_for_field_on_model_object)
56
-    {
57
-        $allowed_enum_values = $this->_allowed_enum_values();
58
-        if (
59
-            $value_inputted_for_field_on_model_object !== null
60
-            && ! array_key_exists($value_inputted_for_field_on_model_object, $allowed_enum_values)
61
-        ) {
62
-            if (defined('WP_DEBUG') && WP_DEBUG) {
63
-                $msg = sprintf(
64
-                    esc_html__('System is assigning incompatible value "%1$s" to field "%2$s"', 'event_espresso'),
65
-                    $value_inputted_for_field_on_model_object,
66
-                    $this->_name
67
-                );
68
-                $msg2 = sprintf(
69
-                    esc_html__('Allowed values for "%1$s" are "%2$s". You provided "%3$s"', 'event_espresso'),
70
-                    $this->_name,
71
-                    implode(', ', array_keys($allowed_enum_values)),
72
-                    $value_inputted_for_field_on_model_object
73
-                );
74
-                EE_Error::add_error("{$msg}||{$msg2}", __FILE__, __FUNCTION__, __LINE__);
75
-            }
76
-            return $this->get_default_value();
77
-        }
78
-        return (int) $value_inputted_for_field_on_model_object;
79
-    }
47
+	/**
48
+	 * When setting, just verify that the value being used matches what we've defined as allowable enum values.
49
+	 * If not, throw an error (but if WP_DEBUG is false, just set the value to default)
50
+	 *
51
+	 * @param int $value_inputted_for_field_on_model_object
52
+	 * @return int
53
+	 * @throws EE_Error
54
+	 */
55
+	public function prepare_for_set($value_inputted_for_field_on_model_object)
56
+	{
57
+		$allowed_enum_values = $this->_allowed_enum_values();
58
+		if (
59
+			$value_inputted_for_field_on_model_object !== null
60
+			&& ! array_key_exists($value_inputted_for_field_on_model_object, $allowed_enum_values)
61
+		) {
62
+			if (defined('WP_DEBUG') && WP_DEBUG) {
63
+				$msg = sprintf(
64
+					esc_html__('System is assigning incompatible value "%1$s" to field "%2$s"', 'event_espresso'),
65
+					$value_inputted_for_field_on_model_object,
66
+					$this->_name
67
+				);
68
+				$msg2 = sprintf(
69
+					esc_html__('Allowed values for "%1$s" are "%2$s". You provided "%3$s"', 'event_espresso'),
70
+					$this->_name,
71
+					implode(', ', array_keys($allowed_enum_values)),
72
+					$value_inputted_for_field_on_model_object
73
+				);
74
+				EE_Error::add_error("{$msg}||{$msg2}", __FILE__, __FUNCTION__, __LINE__);
75
+			}
76
+			return $this->get_default_value();
77
+		}
78
+		return (int) $value_inputted_for_field_on_model_object;
79
+	}
80 80
 
81 81
 
82 82
 
83
-    /**
84
-     * Gets the pretty version of the enum's value.
85
-     *
86
-     * @param int | string $value_on_field_to_be_outputted
87
-     * @param null         $schema
88
-     * @return string
89
-     */
90
-    public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
91
-    {
92
-        $options = $this->_allowed_enum_values();
93
-        if (isset($options[ $value_on_field_to_be_outputted ])) {
94
-            return $options[ $value_on_field_to_be_outputted ];
95
-        } else {
96
-            return $value_on_field_to_be_outputted;
97
-        }
98
-    }
83
+	/**
84
+	 * Gets the pretty version of the enum's value.
85
+	 *
86
+	 * @param int | string $value_on_field_to_be_outputted
87
+	 * @param null         $schema
88
+	 * @return string
89
+	 */
90
+	public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
91
+	{
92
+		$options = $this->_allowed_enum_values();
93
+		if (isset($options[ $value_on_field_to_be_outputted ])) {
94
+			return $options[ $value_on_field_to_be_outputted ];
95
+		} else {
96
+			return $value_on_field_to_be_outputted;
97
+		}
98
+	}
99 99
 
100 100
 
101
-    public function getSchemaProperties()
102
-    {
103
-        return array(
104
-            'raw' => array(
105
-                'description' =>  sprintf(
106
-                    esc_html__('%s - the value in the database.', 'event_espresso'),
107
-                    $this->get_nicename()
108
-                ),
109
-                'enum' => array_keys($this->_allowed_enum_values()),
110
-                'type' => 'integer'
111
-            ),
112
-            'pretty' => array(
113
-                'description' =>  sprintf(
114
-                    esc_html__('%s - the value for display.', 'event_espresso'),
115
-                    $this->get_nicename()
116
-                ),
117
-                'enum' => array_values($this->_allowed_enum_values()),
118
-                'type' => 'string',
119
-                'read_only' => true
120
-            )
121
-        );
122
-    }
101
+	public function getSchemaProperties()
102
+	{
103
+		return array(
104
+			'raw' => array(
105
+				'description' =>  sprintf(
106
+					esc_html__('%s - the value in the database.', 'event_espresso'),
107
+					$this->get_nicename()
108
+				),
109
+				'enum' => array_keys($this->_allowed_enum_values()),
110
+				'type' => 'integer'
111
+			),
112
+			'pretty' => array(
113
+				'description' =>  sprintf(
114
+					esc_html__('%s - the value for display.', 'event_espresso'),
115
+					$this->get_nicename()
116
+				),
117
+				'enum' => array_values($this->_allowed_enum_values()),
118
+				'type' => 'string',
119
+				'read_only' => true
120
+			)
121
+		);
122
+	}
123 123
 }
Please login to merge, or discard this patch.
core/db_models/fields/EE_Maybe_Serialized_Text_Field.php 1 patch
Indentation   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -2,36 +2,36 @@
 block discarded – undo
2 2
 
3 3
 class EE_Maybe_Serialized_Text_Field extends EE_Serialized_Text_Field
4 4
 {
5
-    /**
6
-     * Value could be an array or a string. If its an array, serialize it. Otherwise, leave it as a string
7
-     *
8
-     * @param array|string $value_of_field_on_model_object
9
-     * @return string (possibly serialized)
10
-     */
11
-    public function prepare_for_use_in_db($value_of_field_on_model_object)
12
-    {
13
-        if (is_array($value_of_field_on_model_object)) {
14
-            return parent::prepare_for_use_in_db($value_of_field_on_model_object);
15
-        } else {
16
-            return $value_of_field_on_model_object;
17
-        }
18
-    }
5
+	/**
6
+	 * Value could be an array or a string. If its an array, serialize it. Otherwise, leave it as a string
7
+	 *
8
+	 * @param array|string $value_of_field_on_model_object
9
+	 * @return string (possibly serialized)
10
+	 */
11
+	public function prepare_for_use_in_db($value_of_field_on_model_object)
12
+	{
13
+		if (is_array($value_of_field_on_model_object)) {
14
+			return parent::prepare_for_use_in_db($value_of_field_on_model_object);
15
+		} else {
16
+			return $value_of_field_on_model_object;
17
+		}
18
+	}
19 19
 
20
-    /**
21
-     * Formats the array (or string) according to $schema. Right now, just implode with commas
22
-     *
23
-     * @param type $value_on_field_to_be_outputted
24
-     * @param type $schema
25
-     * @return strubg
26
-     */
27
-    public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
28
-    {
29
-        $pretty_value = null;
30
-        if (is_array($value_on_field_to_be_outputted)) {
31
-            $pretty_value = parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema);
32
-        } else {
33
-            $pretty_value = $value_on_field_to_be_outputted;
34
-        }
35
-        return $pretty_value;
36
-    }
20
+	/**
21
+	 * Formats the array (or string) according to $schema. Right now, just implode with commas
22
+	 *
23
+	 * @param type $value_on_field_to_be_outputted
24
+	 * @param type $schema
25
+	 * @return strubg
26
+	 */
27
+	public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
28
+	{
29
+		$pretty_value = null;
30
+		if (is_array($value_on_field_to_be_outputted)) {
31
+			$pretty_value = parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema);
32
+		} else {
33
+			$pretty_value = $value_on_field_to_be_outputted;
34
+		}
35
+		return $pretty_value;
36
+	}
37 37
 }
Please login to merge, or discard this patch.
core/db_models/fields/EE_Post_Content_Field.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
      */
29 29
     public function prepare_for_set($value)
30 30
     {
31
-        if (! current_user_can('unfiltered_html')) {
31
+        if ( ! current_user_can('unfiltered_html')) {
32 32
             $value = wp_kses("$value", wp_kses_allowed_html('post'));
33 33
         }
34 34
         return parent::prepare_for_set($value);
@@ -96,8 +96,8 @@  discard block
 block discarded – undo
96 96
      */
97 97
     protected static function _setup_the_content_wp_core_only_filters()
98 98
     {
99
-        add_filter('the_content_wp_core_only', array( $GLOBALS['wp_embed'], 'run_shortcode'), 8);
100
-        add_filter('the_content_wp_core_only', array( $GLOBALS['wp_embed'], 'autoembed'), 8);
99
+        add_filter('the_content_wp_core_only', array($GLOBALS['wp_embed'], 'run_shortcode'), 8);
100
+        add_filter('the_content_wp_core_only', array($GLOBALS['wp_embed'], 'autoembed'), 8);
101 101
         add_filter('the_content_wp_core_only', 'wptexturize', 10);
102 102
         add_filter('the_content_wp_core_only', 'wpautop', 10);
103 103
         add_filter('the_content_wp_core_only', 'shortcode_unautop', 10);
Please login to merge, or discard this patch.
Indentation   +114 added lines, -114 removed lines patch added patch discarded remove patch
@@ -7,129 +7,129 @@
 block discarded – undo
7 7
 class EE_Post_Content_Field extends EE_Text_Field_Base
8 8
 {
9 9
 
10
-    /**
11
-     * @param string $table_column
12
-     * @param string $nicename
13
-     * @param bool   $nullable
14
-     * @param null   $default_value
15
-     */
16
-    public function __construct($table_column, $nicename, $nullable, $default_value = null)
17
-    {
18
-        parent::__construct($table_column, $nicename, $nullable, $default_value);
19
-        $this->setSchemaType('object');
20
-    }
10
+	/**
11
+	 * @param string $table_column
12
+	 * @param string $nicename
13
+	 * @param bool   $nullable
14
+	 * @param null   $default_value
15
+	 */
16
+	public function __construct($table_column, $nicename, $nullable, $default_value = null)
17
+	{
18
+		parent::__construct($table_column, $nicename, $nullable, $default_value);
19
+		$this->setSchemaType('object');
20
+	}
21 21
 
22 22
 
23
-    /**
24
-     * removes all tags which a WP Post wouldn't allow in its content normally
25
-     *
26
-     * @param string $value
27
-     * @return string
28
-     */
29
-    public function prepare_for_set($value)
30
-    {
31
-        if (! current_user_can('unfiltered_html')) {
32
-            $value = wp_kses("$value", wp_kses_allowed_html('post'));
33
-        }
34
-        return parent::prepare_for_set($value);
35
-    }
23
+	/**
24
+	 * removes all tags which a WP Post wouldn't allow in its content normally
25
+	 *
26
+	 * @param string $value
27
+	 * @return string
28
+	 */
29
+	public function prepare_for_set($value)
30
+	{
31
+		if (! current_user_can('unfiltered_html')) {
32
+			$value = wp_kses("$value", wp_kses_allowed_html('post'));
33
+		}
34
+		return parent::prepare_for_set($value);
35
+	}
36 36
 
37 37
 
38 38
 
39
-    /**
40
-     * Runs the content through `the_content`, or if prepares the content for placing in a form input
41
-     * @param string $value_on_field_to_be_outputted
42
-     * @param string   $schema possible values: 'form_input' or null (if null, will run through 'the_content')
43
-     * @return string
44
-     * @throws EE_Error when WP_DEBUG is on and recursive calling is detected
45
-     */
46
-    public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
47
-    {
48
-        switch ($schema) {
49
-            case 'form_input':
50
-                return parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema);
51
-            case 'the_content':
52
-                if (doing_filter('the_content')) {
53
-                    if (defined('WP_DEBUG') && WP_DEBUG) {
54
-                        throw new EE_Error(
55
-                            sprintf(
56
-                                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'),
57
-                                'EE_Post_Content_Field::prepare_for_pretty_echoing',
58
-                                '$schema',
59
-                                'the_content',
60
-                                'the_content_wp_core_only'
61
-                            )
62
-                        );
63
-                    } else {
64
-                        return $this->prepare_for_pretty_echoing($value_on_field_to_be_outputted, 'the_content_wp_core_only');
65
-                    }
66
-                }
67
-                return apply_filters(
68
-                    'the_content',
69
-                    parent::prepare_for_pretty_echoing(
70
-                        $value_on_field_to_be_outputted,
71
-                        $schema
72
-                    )
73
-                );
74
-            case 'the_content_wp_core_only':
75
-            default:
76
-                self::_setup_the_content_wp_core_only_filters();
77
-                $return_value = apply_filters(
78
-                    'the_content_wp_core_only',
79
-                    parent::prepare_for_pretty_echoing(
80
-                        $value_on_field_to_be_outputted,
81
-                        $schema
82
-                    )
83
-                );
84
-                // ya know what? adding these filters is super fast. Let's just
85
-                // avoid needing to maintain global state and set this up as-needed
86
-                remove_all_filters('the_content_wp_core_only');
87
-                do_action('AHEE__EE_Post_Content_Field__prepare_for_pretty_echoing__the_content_wp_core_only__done');
88
-                return $return_value;
89
-        }
90
-    }
39
+	/**
40
+	 * Runs the content through `the_content`, or if prepares the content for placing in a form input
41
+	 * @param string $value_on_field_to_be_outputted
42
+	 * @param string   $schema possible values: 'form_input' or null (if null, will run through 'the_content')
43
+	 * @return string
44
+	 * @throws EE_Error when WP_DEBUG is on and recursive calling is detected
45
+	 */
46
+	public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
47
+	{
48
+		switch ($schema) {
49
+			case 'form_input':
50
+				return parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema);
51
+			case 'the_content':
52
+				if (doing_filter('the_content')) {
53
+					if (defined('WP_DEBUG') && WP_DEBUG) {
54
+						throw new EE_Error(
55
+							sprintf(
56
+								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'),
57
+								'EE_Post_Content_Field::prepare_for_pretty_echoing',
58
+								'$schema',
59
+								'the_content',
60
+								'the_content_wp_core_only'
61
+							)
62
+						);
63
+					} else {
64
+						return $this->prepare_for_pretty_echoing($value_on_field_to_be_outputted, 'the_content_wp_core_only');
65
+					}
66
+				}
67
+				return apply_filters(
68
+					'the_content',
69
+					parent::prepare_for_pretty_echoing(
70
+						$value_on_field_to_be_outputted,
71
+						$schema
72
+					)
73
+				);
74
+			case 'the_content_wp_core_only':
75
+			default:
76
+				self::_setup_the_content_wp_core_only_filters();
77
+				$return_value = apply_filters(
78
+					'the_content_wp_core_only',
79
+					parent::prepare_for_pretty_echoing(
80
+						$value_on_field_to_be_outputted,
81
+						$schema
82
+					)
83
+				);
84
+				// ya know what? adding these filters is super fast. Let's just
85
+				// avoid needing to maintain global state and set this up as-needed
86
+				remove_all_filters('the_content_wp_core_only');
87
+				do_action('AHEE__EE_Post_Content_Field__prepare_for_pretty_echoing__the_content_wp_core_only__done');
88
+				return $return_value;
89
+		}
90
+	}
91 91
 
92 92
 
93 93
 
94
-    /**
95
-     * Verifies we've setup the standard WP core filters on  'the_content_wp_core_only' filter
96
-     */
97
-    protected static function _setup_the_content_wp_core_only_filters()
98
-    {
99
-        add_filter('the_content_wp_core_only', array( $GLOBALS['wp_embed'], 'run_shortcode'), 8);
100
-        add_filter('the_content_wp_core_only', array( $GLOBALS['wp_embed'], 'autoembed'), 8);
101
-        add_filter('the_content_wp_core_only', 'wptexturize', 10);
102
-        add_filter('the_content_wp_core_only', 'wpautop', 10);
103
-        add_filter('the_content_wp_core_only', 'shortcode_unautop', 10);
104
-        add_filter('the_content_wp_core_only', 'prepend_attachment', 10);
105
-        if (function_exists('wp_filter_content_tags')) {
106
-            add_filter('the_content_wp_core_only', 'wp_filter_content_tags', 10);
107
-        } elseif (function_exists('wp_make_content_images_responsive')) {
108
-            add_filter('the_content_wp_core_only', 'wp_make_content_images_responsive', 10);
109
-        }
110
-        add_filter('the_content_wp_core_only', 'do_shortcode', 11);
111
-        add_filter('the_content_wp_core_only', 'convert_smilies', 20);
112
-    }
94
+	/**
95
+	 * Verifies we've setup the standard WP core filters on  'the_content_wp_core_only' filter
96
+	 */
97
+	protected static function _setup_the_content_wp_core_only_filters()
98
+	{
99
+		add_filter('the_content_wp_core_only', array( $GLOBALS['wp_embed'], 'run_shortcode'), 8);
100
+		add_filter('the_content_wp_core_only', array( $GLOBALS['wp_embed'], 'autoembed'), 8);
101
+		add_filter('the_content_wp_core_only', 'wptexturize', 10);
102
+		add_filter('the_content_wp_core_only', 'wpautop', 10);
103
+		add_filter('the_content_wp_core_only', 'shortcode_unautop', 10);
104
+		add_filter('the_content_wp_core_only', 'prepend_attachment', 10);
105
+		if (function_exists('wp_filter_content_tags')) {
106
+			add_filter('the_content_wp_core_only', 'wp_filter_content_tags', 10);
107
+		} elseif (function_exists('wp_make_content_images_responsive')) {
108
+			add_filter('the_content_wp_core_only', 'wp_make_content_images_responsive', 10);
109
+		}
110
+		add_filter('the_content_wp_core_only', 'do_shortcode', 11);
111
+		add_filter('the_content_wp_core_only', 'convert_smilies', 20);
112
+	}
113 113
 
114 114
 
115 115
 
116
-    public function getSchemaProperties()
117
-    {
118
-        return array(
119
-            'raw' => array(
120
-                'description' =>  sprintf(
121
-                    esc_html__('%s - the content as it exists in the database.', 'event_espresso'),
122
-                    $this->get_nicename()
123
-                ),
124
-                'type' => 'string'
125
-            ),
126
-            'rendered' => array(
127
-                'description' =>  sprintf(
128
-                    esc_html__('%s - the content rendered for display.', 'event_espresso'),
129
-                    $this->get_nicename()
130
-                ),
131
-                'type' => 'string'
132
-            )
133
-        );
134
-    }
116
+	public function getSchemaProperties()
117
+	{
118
+		return array(
119
+			'raw' => array(
120
+				'description' =>  sprintf(
121
+					esc_html__('%s - the content as it exists in the database.', 'event_espresso'),
122
+					$this->get_nicename()
123
+				),
124
+				'type' => 'string'
125
+			),
126
+			'rendered' => array(
127
+				'description' =>  sprintf(
128
+					esc_html__('%s - the content rendered for display.', 'event_espresso'),
129
+					$this->get_nicename()
130
+				),
131
+				'type' => 'string'
132
+			)
133
+		);
134
+	}
135 135
 }
Please login to merge, or discard this patch.
core/db_models/fields/EE_Maybe_Serialized_Simple_HTML_Field.php 2 patches
Indentation   +51 added lines, -51 removed lines patch added patch discarded remove patch
@@ -11,59 +11,59 @@
 block discarded – undo
11 11
  */
12 12
 class EE_Maybe_Serialized_Simple_HTML_Field extends EE_Maybe_Serialized_Text_Field
13 13
 {
14
-    /**
15
-     * removes all non-basic tags when setting
16
-     *
17
-     * @param string $value_inputted_for_field_on_model_object
18
-     * @return string
19
-     */
20
-    public function prepare_for_set($value_inputted_for_field_on_model_object)
21
-    {
22
-        return parent::prepare_for_set($this->_remove_tags($value_inputted_for_field_on_model_object));
23
-    }
14
+	/**
15
+	 * removes all non-basic tags when setting
16
+	 *
17
+	 * @param string $value_inputted_for_field_on_model_object
18
+	 * @return string
19
+	 */
20
+	public function prepare_for_set($value_inputted_for_field_on_model_object)
21
+	{
22
+		return parent::prepare_for_set($this->_remove_tags($value_inputted_for_field_on_model_object));
23
+	}
24 24
 
25
-    /**
26
-     * Remove any non-"simple" html tags. @see EE_Simple_HTML_Field
27
-     *
28
-     * @param array|string $value
29
-     * @return array|string
30
-     */
31
-    protected function _remove_tags($value)
32
-    {
33
-        if (is_array($value)) {
34
-            foreach ($value as $key => $v) {
35
-                $value[ $key ] = $this->_remove_tags($v);
36
-            }
37
-        } elseif (is_string($value)) {
38
-            $value = wp_kses("$value", $this->_get_allowed_tags());
39
-        }
40
-        return $value;
41
-    }
25
+	/**
26
+	 * Remove any non-"simple" html tags. @see EE_Simple_HTML_Field
27
+	 *
28
+	 * @param array|string $value
29
+	 * @return array|string
30
+	 */
31
+	protected function _remove_tags($value)
32
+	{
33
+		if (is_array($value)) {
34
+			foreach ($value as $key => $v) {
35
+				$value[ $key ] = $this->_remove_tags($v);
36
+			}
37
+		} elseif (is_string($value)) {
38
+			$value = wp_kses("$value", $this->_get_allowed_tags());
39
+		}
40
+		return $value;
41
+	}
42 42
 
43
-    /**
44
-     * In case unsafe data somehow got inserted into the database, we want to remove tags again
45
-     *
46
-     * @param array|string $value_found_in_db_for_model_object
47
-     * @return array|string
48
-     */
49
-    public function prepare_for_set_from_db($value_found_in_db_for_model_object)
50
-    {
51
-        return $this->_remove_tags(parent::prepare_for_set_from_db($value_found_in_db_for_model_object));
52
-    }
43
+	/**
44
+	 * In case unsafe data somehow got inserted into the database, we want to remove tags again
45
+	 *
46
+	 * @param array|string $value_found_in_db_for_model_object
47
+	 * @return array|string
48
+	 */
49
+	public function prepare_for_set_from_db($value_found_in_db_for_model_object)
50
+	{
51
+		return $this->_remove_tags(parent::prepare_for_set_from_db($value_found_in_db_for_model_object));
52
+	}
53 53
 
54 54
 
55
-    /**
56
-     * Determines what tags to allow in this model field
57
-     *
58
-     * @global array $allowedtags
59
-     * @return array
60
-     */
61
-    public function _get_allowed_tags()
62
-    {
63
-        return apply_filters(
64
-            'FHEE__EE_Maybe_Serialized_Simple_HTML_Field___get_allowed_tags',
65
-            EEH_HTML::get_simple_tags(),
66
-            $this
67
-        );
68
-    }
55
+	/**
56
+	 * Determines what tags to allow in this model field
57
+	 *
58
+	 * @global array $allowedtags
59
+	 * @return array
60
+	 */
61
+	public function _get_allowed_tags()
62
+	{
63
+		return apply_filters(
64
+			'FHEE__EE_Maybe_Serialized_Simple_HTML_Field___get_allowed_tags',
65
+			EEH_HTML::get_simple_tags(),
66
+			$this
67
+		);
68
+	}
69 69
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@
 block discarded – undo
32 32
     {
33 33
         if (is_array($value)) {
34 34
             foreach ($value as $key => $v) {
35
-                $value[ $key ] = $this->_remove_tags($v);
35
+                $value[$key] = $this->_remove_tags($v);
36 36
             }
37 37
         } elseif (is_string($value)) {
38 38
             $value = wp_kses("$value", $this->_get_allowed_tags());
Please login to merge, or discard this patch.
core/db_models/fields/EE_DB_Only_Field_Base.php 1 patch
Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -10,28 +10,28 @@
 block discarded – undo
10 10
 abstract class EE_DB_Only_Field_Base extends EE_Model_Field_Base
11 11
 {
12 12
 
13
-    /**
14
-     * @param string $table_column
15
-     * @param string $nicename
16
-     * @param bool   $nullable
17
-     * @param null   $default_value
18
-     */
19
-    public function __construct($table_column, $nicename, $nullable, $default_value = null)
20
-    {
21
-        parent::__construct($table_column, $nicename, $nullable, $default_value);
22
-        $this->setSchemaReadOnly(true);
23
-    }
13
+	/**
14
+	 * @param string $table_column
15
+	 * @param string $nicename
16
+	 * @param bool   $nullable
17
+	 * @param null   $default_value
18
+	 */
19
+	public function __construct($table_column, $nicename, $nullable, $default_value = null)
20
+	{
21
+		parent::__construct($table_column, $nicename, $nullable, $default_value);
22
+		$this->setSchemaReadOnly(true);
23
+	}
24 24
 
25 25
 
26
-    /**
27
-     * All these children classes are for the db-only (meaning, we should select them
28
-     * on get_all queries, update, delete, and will still want to set their default value
29
-     * on inserts, but the model object won't have reference to these fields)
30
-     *
31
-     * @return boolean
32
-     */
33
-    public function is_db_only_field()
34
-    {
35
-        return true;
36
-    }
26
+	/**
27
+	 * All these children classes are for the db-only (meaning, we should select them
28
+	 * on get_all queries, update, delete, and will still want to set their default value
29
+	 * on inserts, but the model object won't have reference to these fields)
30
+	 *
31
+	 * @return boolean
32
+	 */
33
+	public function is_db_only_field()
34
+	{
35
+		return true;
36
+	}
37 37
 }
Please login to merge, or discard this patch.
core/db_models/fields/EE_Primary_Key_String_Field.php 1 patch
Indentation   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -3,22 +3,22 @@
 block discarded – undo
3 3
 class EE_Primary_Key_String_Field extends EE_Primary_Key_Field_Base
4 4
 {
5 5
 
6
-    public function __construct($table_column, $nicename)
7
-    {
8
-        parent::__construct($table_column, $nicename, null);
9
-    }
6
+	public function __construct($table_column, $nicename)
7
+	{
8
+		parent::__construct($table_column, $nicename, null);
9
+	}
10 10
 
11
-    /**
12
-     * removes all tags when setting
13
-     *
14
-     * @param string $value_inputted_for_field_on_model_object
15
-     * @return string
16
-     */
17
-    public function prepare_for_set($value_inputted_for_field_on_model_object)
18
-    {
19
-        if ($this->is_model_obj_of_type_pointed_to($value_inputted_for_field_on_model_object)) {
20
-            $value_inputted_for_field_on_model_object = $value_inputted_for_field_on_model_object->ID();
21
-        }
22
-        return wp_strip_all_tags($value_inputted_for_field_on_model_object);
23
-    }
11
+	/**
12
+	 * removes all tags when setting
13
+	 *
14
+	 * @param string $value_inputted_for_field_on_model_object
15
+	 * @return string
16
+	 */
17
+	public function prepare_for_set($value_inputted_for_field_on_model_object)
18
+	{
19
+		if ($this->is_model_obj_of_type_pointed_to($value_inputted_for_field_on_model_object)) {
20
+			$value_inputted_for_field_on_model_object = $value_inputted_for_field_on_model_object->ID();
21
+		}
22
+		return wp_strip_all_tags($value_inputted_for_field_on_model_object);
23
+	}
24 24
 }
Please login to merge, or discard this patch.
core/db_models/EEM_Message_Template.model.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@
 block discarded – undo
49 49
             );
50 50
         $this->_model_chain_to_wp_user = 'Message_Template_Group';
51 51
         foreach ($this->_cap_contexts_to_cap_action_map as $context => $action) {
52
-            $this->_cap_restriction_generators[ $context ] = new EE_Restriction_Generator_Global('Message_Template_Group.MTP_is_global');
52
+            $this->_cap_restriction_generators[$context] = new EE_Restriction_Generator_Global('Message_Template_Group.MTP_is_global');
53 53
         }
54 54
         $this->_caps_slug = 'messages';
55 55
         parent::__construct($timezone);
Please login to merge, or discard this patch.
Indentation   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -14,45 +14,45 @@
 block discarded – undo
14 14
  */
15 15
 class EEM_Message_Template extends EEM_Base
16 16
 {
17
-    // private instance of the EEM_Message_Template object
18
-    protected static $_instance = null;
17
+	// private instance of the EEM_Message_Template object
18
+	protected static $_instance = null;
19 19
 
20 20
 
21 21
 
22
-    /**
23
-     * private constructor to prevent direct creation
24
-     *
25
-     * @Constructor
26
-     * @access protected
27
-     * @param string $timezone
28
-     * @throws \EE_Error
29
-     */
30
-    protected function __construct($timezone = null)
31
-    {
32
-        $this->singular_item = esc_html__('Message Template', 'event_espresso');
33
-        $this->plural_item = esc_html__('Message Templates', 'event_espresso');
22
+	/**
23
+	 * private constructor to prevent direct creation
24
+	 *
25
+	 * @Constructor
26
+	 * @access protected
27
+	 * @param string $timezone
28
+	 * @throws \EE_Error
29
+	 */
30
+	protected function __construct($timezone = null)
31
+	{
32
+		$this->singular_item = esc_html__('Message Template', 'event_espresso');
33
+		$this->plural_item = esc_html__('Message Templates', 'event_espresso');
34 34
 
35
-        $this->_tables = array(
36
-            'Message_Template' => new EE_Primary_Table('esp_message_template', 'MTP_ID')
37
-        );
38
-        $this->_fields = array(
39
-            'Message_Template' => array(
40
-                'MTP_ID' => new EE_Primary_Key_Int_Field('MTP_ID', esc_html__('Message Template ID', 'event_espresso')),
41
-                'GRP_ID' => new EE_Foreign_Key_Int_Field('GRP_ID', esc_html__('Message Template Group ID', 'event_espresso'), false, 0, 'Message_Template_Group'),
42
-                'MTP_template_field' => new EE_Plain_Text_Field('MTP_template_field', esc_html__('Field Name for this Template', 'event_espresso'), false, 'default'),
43
-                'MTP_context' => new EE_Plain_Text_Field('MTP_context', esc_html__('Message Type Context for this field', 'event_espresso'), false, 'admin'),
44
-                'MTP_content' => new EE_Serialized_Text_Field('MTP_content', esc_html__('The field content for the template', 'event_espresso'), false, ''),
45
-            )
46
-        );
35
+		$this->_tables = array(
36
+			'Message_Template' => new EE_Primary_Table('esp_message_template', 'MTP_ID')
37
+		);
38
+		$this->_fields = array(
39
+			'Message_Template' => array(
40
+				'MTP_ID' => new EE_Primary_Key_Int_Field('MTP_ID', esc_html__('Message Template ID', 'event_espresso')),
41
+				'GRP_ID' => new EE_Foreign_Key_Int_Field('GRP_ID', esc_html__('Message Template Group ID', 'event_espresso'), false, 0, 'Message_Template_Group'),
42
+				'MTP_template_field' => new EE_Plain_Text_Field('MTP_template_field', esc_html__('Field Name for this Template', 'event_espresso'), false, 'default'),
43
+				'MTP_context' => new EE_Plain_Text_Field('MTP_context', esc_html__('Message Type Context for this field', 'event_espresso'), false, 'admin'),
44
+				'MTP_content' => new EE_Serialized_Text_Field('MTP_content', esc_html__('The field content for the template', 'event_espresso'), false, ''),
45
+			)
46
+		);
47 47
 
48
-        $this->_model_relations = array(
49
-            'Message_Template_Group' => new EE_Belongs_To_Relation()
50
-            );
51
-        $this->_model_chain_to_wp_user = 'Message_Template_Group';
52
-        foreach ($this->_cap_contexts_to_cap_action_map as $context => $action) {
53
-            $this->_cap_restriction_generators[ $context ] = new EE_Restriction_Generator_Global('Message_Template_Group.MTP_is_global');
54
-        }
55
-        $this->_caps_slug = 'messages';
56
-        parent::__construct($timezone);
57
-    }
48
+		$this->_model_relations = array(
49
+			'Message_Template_Group' => new EE_Belongs_To_Relation()
50
+			);
51
+		$this->_model_chain_to_wp_user = 'Message_Template_Group';
52
+		foreach ($this->_cap_contexts_to_cap_action_map as $context => $action) {
53
+			$this->_cap_restriction_generators[ $context ] = new EE_Restriction_Generator_Global('Message_Template_Group.MTP_is_global');
54
+		}
55
+		$this->_caps_slug = 'messages';
56
+		parent::__construct($timezone);
57
+	}
58 58
 }
Please login to merge, or discard this patch.
core/db_models/relations/EE_Belongs_To_Any_Relation.php 2 patches
Indentation   +84 added lines, -84 removed lines patch added patch discarded remove patch
@@ -16,94 +16,94 @@
 block discarded – undo
16 16
 {
17 17
 
18 18
 
19
-    /**
20
-     * get_join_statement
21
-     *
22
-     * @param string $model_relation_chain
23
-     * @return string
24
-     * @throws \EE_Error
25
-     */
26
-    public function get_join_statement($model_relation_chain)
27
-    {
28
-        // create the sql string like
29
-        $this_table_fk_field = $this->get_this_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
30
-        // ALSO, need to get the field with the model name
31
-        $field_with_model_name = $this->get_this_model()->get_field_containing_related_model_name();
19
+	/**
20
+	 * get_join_statement
21
+	 *
22
+	 * @param string $model_relation_chain
23
+	 * @return string
24
+	 * @throws \EE_Error
25
+	 */
26
+	public function get_join_statement($model_relation_chain)
27
+	{
28
+		// create the sql string like
29
+		$this_table_fk_field = $this->get_this_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
30
+		// ALSO, need to get the field with the model name
31
+		$field_with_model_name = $this->get_this_model()->get_field_containing_related_model_name();
32 32
 
33 33
 
34
-        $other_table_pk_field = $this->get_other_model()->get_primary_key_field();
35
-        $this_table_alias     = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix(
36
-            $model_relation_chain,
37
-            $this->get_this_model()->get_this_model_name()
38
-        ) . $this_table_fk_field->get_table_alias();
39
-        $other_table_alias    = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix(
40
-            $model_relation_chain,
41
-            $this->get_other_model()->get_this_model_name()
42
-        ) . $other_table_pk_field->get_table_alias();
43
-        $other_table          = $this->get_other_model()->get_table_for_alias($other_table_alias);
44
-        return $this->_left_join(
45
-            $other_table,
46
-            $other_table_alias,
47
-            $other_table_pk_field->get_table_column(),
48
-            $this_table_alias,
49
-            $this_table_fk_field->get_table_column(),
50
-            $field_with_model_name->get_qualified_column() . "='" . $this->get_other_model()->get_this_model_name() . "'"
51
-        )
52
-               . $this->get_other_model()->_construct_internal_join_to_table_with_alias($other_table_alias);
53
-    }
34
+		$other_table_pk_field = $this->get_other_model()->get_primary_key_field();
35
+		$this_table_alias     = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix(
36
+			$model_relation_chain,
37
+			$this->get_this_model()->get_this_model_name()
38
+		) . $this_table_fk_field->get_table_alias();
39
+		$other_table_alias    = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix(
40
+			$model_relation_chain,
41
+			$this->get_other_model()->get_this_model_name()
42
+		) . $other_table_pk_field->get_table_alias();
43
+		$other_table          = $this->get_other_model()->get_table_for_alias($other_table_alias);
44
+		return $this->_left_join(
45
+			$other_table,
46
+			$other_table_alias,
47
+			$other_table_pk_field->get_table_column(),
48
+			$this_table_alias,
49
+			$this_table_fk_field->get_table_column(),
50
+			$field_with_model_name->get_qualified_column() . "='" . $this->get_other_model()->get_this_model_name() . "'"
51
+		)
52
+			   . $this->get_other_model()->_construct_internal_join_to_table_with_alias($other_table_alias);
53
+	}
54 54
 
55 55
 
56
-    /**
57
-     * Sets this model object's foreign key to the other model object's primary key. Feel free to do this manually if
58
-     * you like.
59
-     *
60
-     * @param EE_Base_Class|int $this_obj_or_id
61
-     * @param EE_Base_Class|int $other_obj_or_id
62
-     * @param array             $extra_join_model_fields_n_values
63
-     * @return \EE_Base_Class
64
-     * @throws \EE_Error
65
-     */
66
-    public function add_relation_to($this_obj_or_id, $other_obj_or_id, $extra_join_model_fields_n_values = array())
67
-    {
68
-        $this_model_obj  = $this->get_this_model()->ensure_is_obj($this_obj_or_id, true);
69
-        $other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id, true);
70
-        // find the field on THIS model which a foreign key to the other model
71
-        $fk_on_this_model = $this->get_this_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
72
-        // set that field on the other model to this model's ID
73
-        $this_model_obj->set($fk_on_this_model->get_name(), $other_model_obj->ID());
74
-        // and make sure this model's field with the foreign model name is set to the correct value
75
-        $this_model_obj->set(
76
-            $this->get_this_model()->get_field_containing_related_model_name()->get_name(),
77
-            $this->get_other_model()->get_this_model_name()
78
-        );
79
-        $this_model_obj->save();
80
-        return $other_model_obj;
81
-    }
56
+	/**
57
+	 * Sets this model object's foreign key to the other model object's primary key. Feel free to do this manually if
58
+	 * you like.
59
+	 *
60
+	 * @param EE_Base_Class|int $this_obj_or_id
61
+	 * @param EE_Base_Class|int $other_obj_or_id
62
+	 * @param array             $extra_join_model_fields_n_values
63
+	 * @return \EE_Base_Class
64
+	 * @throws \EE_Error
65
+	 */
66
+	public function add_relation_to($this_obj_or_id, $other_obj_or_id, $extra_join_model_fields_n_values = array())
67
+	{
68
+		$this_model_obj  = $this->get_this_model()->ensure_is_obj($this_obj_or_id, true);
69
+		$other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id, true);
70
+		// find the field on THIS model which a foreign key to the other model
71
+		$fk_on_this_model = $this->get_this_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
72
+		// set that field on the other model to this model's ID
73
+		$this_model_obj->set($fk_on_this_model->get_name(), $other_model_obj->ID());
74
+		// and make sure this model's field with the foreign model name is set to the correct value
75
+		$this_model_obj->set(
76
+			$this->get_this_model()->get_field_containing_related_model_name()->get_name(),
77
+			$this->get_other_model()->get_this_model_name()
78
+		);
79
+		$this_model_obj->save();
80
+		return $other_model_obj;
81
+	}
82 82
 
83 83
 
84
-    /**
85
-     * Sets the this model object's foreign key to its default, instead of pointing to the other model object
86
-     *
87
-     * @param EE_Base_Class|int $this_obj_or_id
88
-     * @param EE_Base_Class|int $other_obj_or_id
89
-     * @param array             $where_query
90
-     * @return \EE_Base_Class
91
-     * @throws \EE_Error
92
-     */
93
-    public function remove_relation_to($this_obj_or_id, $other_obj_or_id, $where_query = array())
94
-    {
95
-        $this_model_obj  = $this->get_this_model()->ensure_is_obj($this_obj_or_id, true);
96
-        $other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id);
97
-        // find the field on the other model which is a foreign key to this model
98
-        $fk_on_this_model = $this->get_this_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
99
-        // set that field on the other model to this model's ID
100
-        $this_model_obj->set($fk_on_this_model->get_name(), null, true);
101
-        $this_model_obj->set(
102
-            $this->get_this_model()->get_field_containing_related_model_name()->get_name(),
103
-            null,
104
-            true
105
-        );
106
-        $this_model_obj->save();
107
-        return $other_model_obj;
108
-    }
84
+	/**
85
+	 * Sets the this model object's foreign key to its default, instead of pointing to the other model object
86
+	 *
87
+	 * @param EE_Base_Class|int $this_obj_or_id
88
+	 * @param EE_Base_Class|int $other_obj_or_id
89
+	 * @param array             $where_query
90
+	 * @return \EE_Base_Class
91
+	 * @throws \EE_Error
92
+	 */
93
+	public function remove_relation_to($this_obj_or_id, $other_obj_or_id, $where_query = array())
94
+	{
95
+		$this_model_obj  = $this->get_this_model()->ensure_is_obj($this_obj_or_id, true);
96
+		$other_model_obj = $this->get_other_model()->ensure_is_obj($other_obj_or_id);
97
+		// find the field on the other model which is a foreign key to this model
98
+		$fk_on_this_model = $this->get_this_model()->get_foreign_key_to($this->get_other_model()->get_this_model_name());
99
+		// set that field on the other model to this model's ID
100
+		$this_model_obj->set($fk_on_this_model->get_name(), null, true);
101
+		$this_model_obj->set(
102
+			$this->get_this_model()->get_field_containing_related_model_name()->get_name(),
103
+			null,
104
+			true
105
+		);
106
+		$this_model_obj->save();
107
+		return $other_model_obj;
108
+	}
109 109
 }
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -35,19 +35,19 @@
 block discarded – undo
35 35
         $this_table_alias     = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix(
36 36
             $model_relation_chain,
37 37
             $this->get_this_model()->get_this_model_name()
38
-        ) . $this_table_fk_field->get_table_alias();
39
-        $other_table_alias    = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix(
38
+        ).$this_table_fk_field->get_table_alias();
39
+        $other_table_alias = EE_Model_Parser::extract_table_alias_model_relation_chain_prefix(
40 40
             $model_relation_chain,
41 41
             $this->get_other_model()->get_this_model_name()
42
-        ) . $other_table_pk_field->get_table_alias();
43
-        $other_table          = $this->get_other_model()->get_table_for_alias($other_table_alias);
42
+        ).$other_table_pk_field->get_table_alias();
43
+        $other_table = $this->get_other_model()->get_table_for_alias($other_table_alias);
44 44
         return $this->_left_join(
45 45
             $other_table,
46 46
             $other_table_alias,
47 47
             $other_table_pk_field->get_table_column(),
48 48
             $this_table_alias,
49 49
             $this_table_fk_field->get_table_column(),
50
-            $field_with_model_name->get_qualified_column() . "='" . $this->get_other_model()->get_this_model_name() . "'"
50
+            $field_with_model_name->get_qualified_column()."='".$this->get_other_model()->get_this_model_name()."'"
51 51
         )
52 52
                . $this->get_other_model()->_construct_internal_join_to_table_with_alias($other_table_alias);
53 53
     }
Please login to merge, or discard this patch.