Completed
Push — develop ( 755a17...843010 )
by Daniel
07:33
created
model/entity/type.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -306,11 +306,11 @@
 block discarded – undo
306 306
 		$summary_tags = $this->get_template_tags($summary_tags, $this->summary_tpl, $fields);
307 307
 		$detail_tags = $this->get_template_tags($detail_tags, $this->detail_tpl, $fields);
308 308
 
309
-		$this->summary_tags	= array_intersect_key($field_types, array_flip($summary_tags));
310
-		$this->detail_tags	= array_intersect_key($field_types, array_flip($detail_tags));
309
+		$this->summary_tags = array_intersect_key($field_types, array_flip($summary_tags));
310
+		$this->detail_tags = array_intersect_key($field_types, array_flip($detail_tags));
311 311
 
312
-		$this->content_fields	= $content_fields;
313
-		$this->field_types		= $field_types;
312
+		$this->content_fields = $content_fields;
313
+		$this->field_types = $field_types;
314 314
 	}
315 315
 
316 316
 	/**
Please login to merge, or discard this patch.
blocks/archive.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -94,8 +94,8 @@
 block discarded – undo
94 94
 			'FROM'		=> array(
95 95
 				TOPICS_TABLE => 't',
96 96
 			),
97
-			'WHERE'		=> 't.forum_id = ' . (int) $settings['forum_id'] . '
98
-				AND t.topic_time <= ' . time() . '
97
+			'WHERE'		=> 't.forum_id = '.(int) $settings['forum_id'].'
98
+				AND t.topic_time <= ' . time().'
99 99
 				AND ' . $this->content_visibility->get_global_visibility_sql('topic', array_keys($this->auth->acl_getf('!f_read', true)), 't.'),
100 100
 			'GROUP_BY'	=> 'year, month',
101 101
 			'ORDER_BY'	=> 'year DESC',
Please login to merge, or discard this patch.
controller/ucp_controller.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@
 block discarded – undo
46 46
 		catch (\blitze\sitemaker\exception\base $e)
47 47
 		{
48 48
 			$message = $e->get_message($this->language);
49
-			trigger_error($message . '<br /><br />' . $this->language->lang('RETURN_PAGE', '<a href="' . $base_url . '">', '</a>'));
49
+			trigger_error($message.'<br /><br />'.$this->language->lang('RETURN_PAGE', '<a href="'.$base_url.'">', '</a>'));
50 50
 		}
51 51
 	}
52 52
 }
Please login to merge, or discard this patch.
controller/main_controller.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -156,15 +156,15 @@
 block discarded – undo
156 156
 	{
157 157
 		if (!$this->user->data['is_bot'] && !$this->request->is_set('page'))
158 158
 		{
159
-			$sql = 'UPDATE ' . TOPICS_TABLE . '
160
-				SET topic_views = topic_views + 1, topic_last_view_time = ' . time() . "
159
+			$sql = 'UPDATE '.TOPICS_TABLE.'
160
+				SET topic_views = topic_views + 1, topic_last_view_time = ' . time()."
161 161
 				WHERE topic_id = $topic_id";
162 162
 			$this->db->sql_query($sql);
163 163
 
164 164
 			// Update the attachment download counts
165 165
 			if (sizeof($update_count))
166 166
 			{
167
-				$sql = 'UPDATE ' . ATTACHMENTS_TABLE . '
167
+				$sql = 'UPDATE '.ATTACHMENTS_TABLE.'
168 168
 					SET download_count = download_count + 1
169 169
 					WHERE ' . $this->db->sql_in_set('attach_id', array_unique($update_count));
170 170
 				$this->db->sql_query($sql);
Please login to merge, or discard this patch.
model/mapper/fields.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -25,8 +25,8 @@  discard block
 block discarded – undo
25 25
 	 */
26 26
 	protected function _find_sql(array $sql_where)
27 27
 	{
28
-		return 'SELECT * FROM ' . $this->entity_table .
29
-			((sizeof($sql_where)) ? ' WHERE ' . join(' AND ', $sql_where) : '') . '
28
+		return 'SELECT * FROM '.$this->entity_table.
29
+			((sizeof($sql_where)) ? ' WHERE '.join(' AND ', $sql_where) : '').'
30 30
 			ORDER BY field_order ASC';
31 31
 	}
32 32
 
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 	 */
36 36
 	public function get_max_field_id()
37 37
 	{
38
-		$result = $this->db->sql_query('SELECT MAX(' . $this->entity_pkey . ') AS max_id FROM ' . $this->entity_table);
38
+		$result = $this->db->sql_query('SELECT MAX('.$this->entity_pkey.') AS max_id FROM '.$this->entity_table);
39 39
 		$max_id = $this->db->sql_fetchfield('max_id');
40 40
 		$this->db->sql_freeresult($result);
41 41
 
Please login to merge, or discard this patch.
model/mapper_factory.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -36,8 +36,8 @@
 block discarded – undo
36 36
 	 */
37 37
 	public function create($type)
38 38
 	{
39
-		$mapper_class = 'blitze\\content\\model\\mapper\\' . $type;
40
-		$collection = 'blitze\\content\\model\\collections\\' . $type;
39
+		$mapper_class = 'blitze\\content\\model\\mapper\\'.$type;
40
+		$collection = 'blitze\\content\\model\\collections\\'.$type;
41 41
 
42 42
 		return new $mapper_class($this->db, new $collection, $this, $this->mapper_tables[$type]);
43 43
 	}
Please login to merge, or discard this patch.
services/template/loader.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -131,7 +131,7 @@
 block discarded – undo
131 131
 		else
132 132
 		{
133 133
 			$data = $this->content_types[$id];
134
-			$column_name = $view . '_tpl';
134
+			$column_name = $view.'_tpl';
135 135
 		}
136 136
 
137 137
 		$return = array(
Please login to merge, or discard this patch.
services/template/twig.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -42,9 +42,9 @@
 block discarded – undo
42 42
 		}
43 43
 
44 44
 		// Add admin namespace
45
-		if ($this->path_helper->get_adm_relative_path() !== null && is_dir($this->phpbb_root_path . $this->path_helper->get_adm_relative_path() . 'style/'))
45
+		if ($this->path_helper->get_adm_relative_path() !== null && is_dir($this->phpbb_root_path.$this->path_helper->get_adm_relative_path().'style/'))
46 46
 		{
47
-			$this->twig->getLoader()->setPaths($this->phpbb_root_path . $this->path_helper->get_adm_relative_path() . 'style/', 'admin');
47
+			$this->twig->getLoader()->setPaths($this->phpbb_root_path.$this->path_helper->get_adm_relative_path().'style/', 'admin');
48 48
 		}
49 49
 	}
50 50
 }
Please login to merge, or discard this patch.
services/form/form.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -92,7 +92,7 @@
 block discarded – undo
92 92
 	 */
93 93
 	public function add($name, $type, array $field_data, $forum_id = 0, $topic_id = 0)
94 94
 	{
95
-		$field_data += array('field_id' => 'field-' . $name);
95
+		$field_data += array('field_id' => 'field-'.$name);
96 96
 		$field_data += $this->get_default_field_data();
97 97
 
98 98
 		if ($this->fields_factory->exists($type))
Please login to merge, or discard this patch.