Completed
Branch old/BUG-7514-7935-7936-price-o... (518ae6)
by
unknown
13:33 queued 11:14
created
core/db_models/fields/EE_Primary_Key_Field_Base.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,18 +1,18 @@
 block discarded – undo
1 1
 <?php
2
-abstract class EE_Primary_Key_Field_Base extends EE_Field_With_Model_Name{
2
+abstract class EE_Primary_Key_Field_Base extends EE_Field_With_Model_Name {
3 3
 	/**
4 4
 	 * Overrides parent so it doesn't need to provide so many non-applicable fields
5 5
 	 * @param string $table_column
6 6
 	 * @param string $nicename
7 7
 	 */
8
-	public function __construct($table_column, $nicename,$default) {
8
+	public function __construct($table_column, $nicename, $default) {
9 9
 		parent::__construct($table_column, $nicename, false, $default, null);
10 10
 	}
11 11
 	/**
12 12
 	 * @param $table_alias
13 13
 	 * @param $name
14 14
 	 */
15
-	function _construct_finalize($table_alias, $name, $model_name){
15
+	function _construct_finalize($table_alias, $name, $model_name) {
16 16
 		$this->_model_name_pointed_to = $model_name;
17 17
 		parent::_construct_finalize($table_alias, $name, $model_name);
18 18
 	}
Please login to merge, or discard this patch.
core/db_models/fields/EE_Primary_Key_Int_Field.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,14 +1,14 @@
 block discarded – undo
1 1
 <?php
2
-require_once( EE_MODELS . 'fields/EE_Primary_Key_Field_Base.php');
3
-class EE_Primary_Key_Int_Field extends EE_Primary_Key_Field_Base{
4
-	function get_wpdb_data_type(){
2
+require_once(EE_MODELS.'fields/EE_Primary_Key_Field_Base.php');
3
+class EE_Primary_Key_Int_Field extends EE_Primary_Key_Field_Base {
4
+	function get_wpdb_data_type() {
5 5
 		return '%d';
6 6
 	}
7 7
 	public function __construct($table_column, $nicename) {
8 8
 		parent::__construct($table_column, $nicename, 0);
9 9
 	}
10 10
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
11
-		if($this->is_model_obj_of_type_pointed_to($value_inputted_for_field_on_model_object)){
11
+		if ($this->is_model_obj_of_type_pointed_to($value_inputted_for_field_on_model_object)) {
12 12
 			$value_inputted_for_field_on_model_object = $value_inputted_for_field_on_model_object->ID();
13 13
 		}
14 14
 		return absint($value_inputted_for_field_on_model_object);
Please login to merge, or discard this patch.
core/db_models/fields/EE_Primary_Key_String_Field.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 require_once('EE_Primary_Key_Field_Base.php');
3
-class EE_Primary_Key_String_Field extends EE_Primary_Key_Field_Base{
4
-	function get_wpdb_data_type(){
3
+class EE_Primary_Key_String_Field extends EE_Primary_Key_Field_Base {
4
+	function get_wpdb_data_type() {
5 5
 		return '%s';
6 6
 	}
7 7
 	public function __construct($table_column, $nicename) {
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 	 * @return string
14 14
 	 */
15 15
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
16
-	if($this->is_model_obj_of_type_pointed_to($value_inputted_for_field_on_model_object)){
16
+	if ($this->is_model_obj_of_type_pointed_to($value_inputted_for_field_on_model_object)) {
17 17
 			$value_inputted_for_field_on_model_object = $value_inputted_for_field_on_model_object->ID();
18 18
 		}
19 19
 		return wp_strip_all_tags($value_inputted_for_field_on_model_object);
Please login to merge, or discard this patch.
core/db_models/fields/EE_Serialized_Text_Field.php 2 patches
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -7,8 +7,8 @@  discard block
 block discarded – undo
7 7
  * However, when inserting into the DB, it should be serialized.
8 8
  * Upon retrieval from the DB, it should be unserialized back into an array.
9 9
  */
10
-require_once( EE_MODELS . 'fields/EE_Text_Field_Base.php' );
11
-class EE_Serialized_Text_Field extends EE_Text_Field_Base{
10
+require_once(EE_MODELS.'fields/EE_Text_Field_Base.php');
11
+class EE_Serialized_Text_Field extends EE_Text_Field_Base {
12 12
 	/**
13 13
 	 * Value SHOULD be an array, and we want to now convert it to a serialized string
14 14
 	 * @param array $value_of_field_on_model_object
@@ -18,11 +18,11 @@  discard block
 block discarded – undo
18 18
 		return maybe_serialize($value_of_field_on_model_object);
19 19
 	}
20 20
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
21
-		if(is_string($value_inputted_for_field_on_model_object)){
21
+		if (is_string($value_inputted_for_field_on_model_object)) {
22 22
 			return parent::prepare_for_set($value_inputted_for_field_on_model_object);
23
-		}elseif(is_array($value_inputted_for_field_on_model_object)){
24
-			return array_map(array($this,'prepare_for_set'), $value_inputted_for_field_on_model_object);
25
-		}else{//so they passed NULL or an INT or something wack
23
+		}elseif (is_array($value_inputted_for_field_on_model_object)) {
24
+			return array_map(array($this, 'prepare_for_set'), $value_inputted_for_field_on_model_object);
25
+		} else {//so they passed NULL or an INT or something wack
26 26
 			return $value_inputted_for_field_on_model_object;
27 27
 		}
28 28
 	}
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 		//it's possible that this still has serialized data if its the session.  WP has a bug, http://core.trac.wordpress.org/ticket/26118 that doesnt' unserialize this automatically.
37 37
 		$token = 'C';
38 38
 		$data = is_string($data) ? trim($data) : $data;
39
-		if ( is_string($data) && strlen($data) > 1 && $data[0] == $token  && preg_match( "/^{$token}:[0-9]+:/s", $data ) ) {
39
+		if (is_string($data) && strlen($data) > 1 && $data[0] == $token && preg_match("/^{$token}:[0-9]+:/s", $data)) {
40 40
 			return unserialize($data);
41 41
 		} else {
42 42
 			return $data;
@@ -50,16 +50,16 @@  discard block
 block discarded – undo
50 50
 	 * @return string
51 51
 	 */
52 52
 	function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null) {
53
-		switch($schema){
53
+		switch ($schema) {
54 54
 			case 'print_r':
55
-				$pretty_value = print_r($value_on_field_to_be_outputted,true);
55
+				$pretty_value = print_r($value_on_field_to_be_outputted, true);
56 56
 				break;
57 57
 			case 'as_table':
58 58
 				EE_Registry::instance()->load_helper('Template');
59 59
 				$pretty_value = EEH_Template::layout_array_as_table($value_on_field_to_be_outputted);
60 60
 				break;
61 61
 			default:
62
-				$pretty_value = implode(", ",$value_on_field_to_be_outputted);
62
+				$pretty_value = implode(", ", $value_on_field_to_be_outputted);
63 63
 		}
64 64
 		return $pretty_value;
65 65
 	}
Please login to merge, or discard this patch.
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -20,9 +20,9 @@
 block discarded – undo
20 20
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
21 21
 		if(is_string($value_inputted_for_field_on_model_object)){
22 22
 			return parent::prepare_for_set($value_inputted_for_field_on_model_object);
23
-		}elseif(is_array($value_inputted_for_field_on_model_object)){
23
+		} elseif(is_array($value_inputted_for_field_on_model_object)){
24 24
 			return array_map(array($this,'prepare_for_set'), $value_inputted_for_field_on_model_object);
25
-		}else{//so they passed NULL or an INT or something wack
25
+		} else{//so they passed NULL or an INT or something wack
26 26
 			return $value_inputted_for_field_on_model_object;
27 27
 		}
28 28
 	}
Please login to merge, or discard this patch.
core/db_models/fields/EE_Simple_HTML_Field.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@  discard block
 block discarded – undo
1 1
 <?php
2
-require_once( EE_MODELS . 'fields/EE_Text_Field_Base.php' );
2
+require_once(EE_MODELS.'fields/EE_Text_Field_Base.php');
3 3
 /**
4 4
  * Only allows a select, small number of html tags: a,abbr,acronym,b,blockquote,cite,code,del,em,i,q,strike,strong,ol,ul,li
5 5
  * If you want more use EE_Post_Content_Field, or if you want to allow ALL, use EE_Full_HTML_Field.
6 6
  * If you want NONE, use EE_Plain_Text_Field.
7 7
  */
8
-class EE_Simple_HTML_Field extends EE_Text_Field_Base{
8
+class EE_Simple_HTML_Field extends EE_Text_Field_Base {
9 9
 	/**
10 10
 	 * removes all tags when setting
11 11
 	 * @param string $value_inputted_for_field_on_model_object
@@ -13,10 +13,10 @@  discard block
 block discarded – undo
13 13
 	 */
14 14
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
15 15
 		global $allowedtags;
16
-		$allowedtags['ol']=array();
17
-		$allowedtags['ul']=array();
18
-		$allowedtags['li']=array();
19
-		$value_with_select_tags =  wp_kses("$value_inputted_for_field_on_model_object",$allowedtags);
16
+		$allowedtags['ol'] = array();
17
+		$allowedtags['ul'] = array();
18
+		$allowedtags['li'] = array();
19
+		$value_with_select_tags = wp_kses("$value_inputted_for_field_on_model_object", $allowedtags);
20 20
 		return parent::prepare_for_set($value_with_select_tags);
21 21
 	}
22 22
 
Please login to merge, or discard this patch.
core/db_models/fields/EE_Slug_Field.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2
-require_once( EE_MODELS . 'fields/EE_Text_Field_Base.php' );
3
-class EE_Slug_Field extends EE_Text_Field_Base{
2
+require_once(EE_MODELS.'fields/EE_Text_Field_Base.php');
3
+class EE_Slug_Field extends EE_Text_Field_Base {
4 4
 	/**
5 5
 	 * ensures string is usable in URLs
6 6
 	 * @param string $value_inputted_for_field_on_model_object
Please login to merge, or discard this patch.
core/db_models/fields/EE_Text_Field_Base.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -2,13 +2,13 @@  discard block
 block discarded – undo
2 2
 /**
3 3
  * Text_Fields is a base class for any fields which are have text value. (Exception: foreign and private key fields. Wish PHP had multiple-inheritance for this...)
4 4
  */
5
-abstract class EE_Text_Field_Base extends EE_Model_Field_Base{
6
-	function get_wpdb_data_type(){
5
+abstract class EE_Text_Field_Base extends EE_Model_Field_Base {
6
+	function get_wpdb_data_type() {
7 7
 		return '%s';
8 8
 	}
9 9
 
10
-	function prepare_for_get( $value_of_field_on_model_object ) {
11
-		return is_string($value_of_field_on_model_object) ? stripslashes( $value_of_field_on_model_object ) : $value_of_field_on_model_object;
10
+	function prepare_for_get($value_of_field_on_model_object) {
11
+		return is_string($value_of_field_on_model_object) ? stripslashes($value_of_field_on_model_object) : $value_of_field_on_model_object;
12 12
 	}
13 13
 	
14 14
 	/**
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
 	 * @return string
19 19
 	 */
20 20
 	function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null) {
21
-		if($schema=='form_input'){
21
+		if ($schema == 'form_input') {
22 22
 			$value_on_field_to_be_outputted = htmlentities($value_on_field_to_be_outputted, ENT_QUOTES, 'UTF-8');
23 23
 		}
24 24
 		return parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema);
@@ -30,6 +30,6 @@  discard block
 block discarded – undo
30 30
 	 * @return string
31 31
 	 */
32 32
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
33
-		return stripslashes(html_entity_decode(parent::prepare_for_set($value_inputted_for_field_on_model_object),ENT_QUOTES,'UTF-8'));
33
+		return stripslashes(html_entity_decode(parent::prepare_for_set($value_inputted_for_field_on_model_object), ENT_QUOTES, 'UTF-8'));
34 34
 	}
35 35
 }
36 36
\ No newline at end of file
Please login to merge, or discard this patch.
core/db_models/fields/EE_Trashed_Flag_Field.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2
-require_once( EE_MODELS . 'fields/EE_Boolean_Field.php');
3
-class EE_Trashed_Flag_Field extends EE_Boolean_Field{
2
+require_once(EE_MODELS.'fields/EE_Boolean_Field.php');
3
+class EE_Trashed_Flag_Field extends EE_Boolean_Field {
4 4
 	//note: some client code simply checks if a field IS an EE_Trashed_Flag_Field
5 5
 	//...otherwise, these fields are mostly the same as boolean fields
6 6
 }
Please login to merge, or discard this patch.
core/db_models/fields/EE_WP_Post_Status_Field.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2
-require_once( EE_MODELS . 'fields/EE_Enum_Text_Field.php' );
3
-class EE_WP_Post_Status_Field extends EE_Enum_Text_Field{
2
+require_once(EE_MODELS.'fields/EE_Enum_Text_Field.php');
3
+class EE_WP_Post_Status_Field extends EE_Enum_Text_Field {
4 4
 
5 5
 	protected $_wp_post_stati;
6 6
 
@@ -28,8 +28,8 @@  discard block
 block discarded – undo
28 28
 	 * @link http://codex.wordpress.org/Function_Reference/register_post_status for more info
29 29
 	 * @param boolean $store_in_db_as_int By default, enums are stored as STRINGS in the DB. However, if this var is set to true, it will be stored as an INT
30 30
 	 */
31
-	function __construct($table_column, $nicename, $nullable, $default_value, $new_stati = array()){
32
-		$this->_register_new_stati( $new_stati );
31
+	function __construct($table_column, $nicename, $nullable, $default_value, $new_stati = array()) {
32
+		$this->_register_new_stati($new_stati);
33 33
 		$this->_set_allowed_enum_values();
34 34
 		parent::__construct($table_column, $nicename, $nullable, $default_value, $this->_allowed_enum_values);
35 35
 	}
@@ -46,18 +46,18 @@  discard block
 block discarded – undo
46 46
 	 * @param  array $new_stati statuses
47 47
 	 * @return void
48 48
 	 */
49
-	protected function _register_new_stati( $new_stati ) {
49
+	protected function _register_new_stati($new_stati) {
50 50
 
51
-		foreach ( (array) $new_stati as $status_key => $status_args ) {
51
+		foreach ((array) $new_stati as $status_key => $status_args) {
52 52
 			$args = array(
53
-				'label' => isset( $status_args['label'] ) ? $status_args['label'] : $status_key,
54
-				'public' => isset( $status_args['public'] ) && is_bool( $status_args['public'] ) ? $status_args['public'] : TRUE,
55
-				'exclude_from_search' => isset( $status_args['exclude_from_search'] ) && is_bool($status_args['exclude_from_search'] ) ? $status_args['exclude_from_search'] : FALSE,
56
-				'show_in_admin_all_list' => isset( $status_args['show_in_admin_all_list'] ) && is_bool( $status_args['show_in_admin_all_list'] ) ? $status_args['show_in_admin_all_list'] : FALSE,
57
-				'show_in_admin_status_list' =>  isset( $status_args['show_in_admin_status_list'] ) && is_bool( $status_args['show_in_admin_status_list'] ) ? $status_args['show_in_admin_status_list'] : TRUE,
58
-				'label_count' => isset( $status_args['label_count'] ) ? $status_args['label_count'] : ''
53
+				'label' => isset($status_args['label']) ? $status_args['label'] : $status_key,
54
+				'public' => isset($status_args['public']) && is_bool($status_args['public']) ? $status_args['public'] : TRUE,
55
+				'exclude_from_search' => isset($status_args['exclude_from_search']) && is_bool($status_args['exclude_from_search']) ? $status_args['exclude_from_search'] : FALSE,
56
+				'show_in_admin_all_list' => isset($status_args['show_in_admin_all_list']) && is_bool($status_args['show_in_admin_all_list']) ? $status_args['show_in_admin_all_list'] : FALSE,
57
+				'show_in_admin_status_list' =>  isset($status_args['show_in_admin_status_list']) && is_bool($status_args['show_in_admin_status_list']) ? $status_args['show_in_admin_status_list'] : TRUE,
58
+				'label_count' => isset($status_args['label_count']) ? $status_args['label_count'] : ''
59 59
 				);
60
-			register_post_status( $status_key, $status_args );
60
+			register_post_status($status_key, $status_args);
61 61
 		}
62 62
 
63 63
 	}
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 		global $wp_post_statuses;
79 79
 		$this->_wp_post_stati = $wp_post_statuses;
80 80
 
81
-		foreach( $this->_wp_post_stati  as $post_status => $args_object ) {
81
+		foreach ($this->_wp_post_stati  as $post_status => $args_object) {
82 82
 			$this->_allowed_enum_values[$post_status] = $args_object->label;
83 83
 		}
84 84
 
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
108 108
 	 * @param  string $status What status object you want
109 109
 	 * @return std_object         the status object or FALSE if it doesn't exist.
110 110
 	 */
111
-	public function get_status_object( $status ) {
112
-		return isset( $this->_wp_post_stati[$status] ) ? $this->_wp_post_stati[$status] : FALSE;
111
+	public function get_status_object($status) {
112
+		return isset($this->_wp_post_stati[$status]) ? $this->_wp_post_stati[$status] : FALSE;
113 113
 	}
114 114
 }
115 115
\ No newline at end of file
Please login to merge, or discard this patch.