@@ -13,17 +13,17 @@ |
||
13 | 13 | { |
14 | 14 | |
15 | 15 | /** |
16 | - * Constructor. |
|
17 | - * |
|
18 | - * @param \phpbb\path_helper $path_helper |
|
19 | - * @param \phpbb\config\config $config |
|
20 | - * @param \phpbb\template\context $context template context |
|
21 | - * @param \phpbb\template\twig\environment $twig_environment |
|
22 | - * @param string $cache_path |
|
23 | - * @param \phpbb\user|null $user |
|
24 | - * @param array|\ArrayAccess $extensions |
|
25 | - * @param \phpbb\extension\manager $extension_manager extension manager, if null then template events will not be invoked |
|
26 | - */ |
|
16 | + * Constructor. |
|
17 | + * |
|
18 | + * @param \phpbb\path_helper $path_helper |
|
19 | + * @param \phpbb\config\config $config |
|
20 | + * @param \phpbb\template\context $context template context |
|
21 | + * @param \phpbb\template\twig\environment $twig_environment |
|
22 | + * @param string $cache_path |
|
23 | + * @param \phpbb\user|null $user |
|
24 | + * @param array|\ArrayAccess $extensions |
|
25 | + * @param \phpbb\extension\manager $extension_manager extension manager, if null then template events will not be invoked |
|
26 | + */ |
|
27 | 27 | public function __construct(\phpbb\path_helper $path_helper, $config, \phpbb\template\context $context, \phpbb\template\twig\environment $twig_environment, $cache_path, \phpbb\user $user = null, $extensions = array(), \phpbb\extension\manager $extension_manager = null) |
28 | 28 | { |
29 | 29 | $this->path_helper = $path_helper; |
@@ -127,8 +127,7 @@ |
||
127 | 127 | { |
128 | 128 | $data = $this->blocks_data[$id]; |
129 | 129 | $column_name = 'block_tpl'; |
130 | - } |
|
131 | - else |
|
130 | + } else |
|
132 | 131 | { |
133 | 132 | $data = $this->content_types[$id]; |
134 | 133 | $column_name = $view . '_tpl'; |
@@ -211,7 +211,7 @@ discard block |
||
211 | 211 | $l_edited_by = $edit_reason = ''; |
212 | 212 | if (($row['post_edit_count'] && $this->config['display_last_edited']) || $row['post_edit_reason']) |
213 | 213 | { |
214 | - $display_username = $users_cache[$row['poster_id']]['username_full']; |
|
214 | + $display_username = $users_cache[$row['poster_id']]['username_full']; |
|
215 | 215 | $l_edited_by = $this->language->lang('EDITED_TIMES_TOTAL', (int) $row['post_edit_count'], $display_username, $this->user->format_date($row['post_edit_time'], false, true)); |
216 | 216 | $edit_reason = $row['post_edit_reason']; |
217 | 217 | } |
@@ -232,8 +232,8 @@ discard block |
||
232 | 232 | $l_deleted_by = $delete_reason = $l_deleted_message = ''; |
233 | 233 | if ($row['post_visibility'] === ITEM_DELETED && $row['post_delete_user']) |
234 | 234 | { |
235 | - $display_postername = $users_cache[$row['poster_id']]['username_full']; |
|
236 | - $display_username = $users_cache[$row['post_delete_user']]['username_full']; |
|
235 | + $display_postername = $users_cache[$row['poster_id']]['username_full']; |
|
236 | + $display_username = $users_cache[$row['post_delete_user']]['username_full']; |
|
237 | 237 | |
238 | 238 | if ($row['post_delete_reason']) |
239 | 239 | { |
@@ -238,8 +238,7 @@ |
||
238 | 238 | if ($row['post_delete_reason']) |
239 | 239 | { |
240 | 240 | $l_deleted_message = $this->language->lang('POST_DELETED_BY_REASON', $display_postername, $display_username, $this->user->format_date($row['post_delete_time'], false, true), $row['post_delete_reason']); |
241 | - } |
|
242 | - else |
|
241 | + } else |
|
243 | 242 | { |
244 | 243 | $l_deleted_message = $this->language->lang('POST_DELETED_BY', $display_postername, $display_username, $this->user->format_date($row['post_delete_time'], false, true)); |
245 | 244 | } |
@@ -168,7 +168,7 @@ |
||
168 | 168 | { |
169 | 169 | $field_type = $row['field_type']; |
170 | 170 | $field_value = &$post_field_data[$field_name]; |
171 | - $field_contents = $this->form_fields[$field_type]->display_field($field_value, $this->view_mode, $tpl_data, $row); |
|
171 | + $field_contents = $this->form_fields[$field_type]->display_field($field_value, $this->view_mode, $tpl_data, $row); |
|
172 | 172 | |
173 | 173 | // this essentially hides other fields if the field returns an array |
174 | 174 | if (is_array($field_contents)) |
@@ -122,8 +122,7 @@ |
||
122 | 122 | )), CASE_UPPER)); |
123 | 123 | $this->template->set_filenames(array('content' => $this->tpl_name)); |
124 | 124 | $tpl_data['CUSTOM_DISPLAY'] = $this->template->assign_display('content'); |
125 | - } |
|
126 | - else |
|
125 | + } else |
|
127 | 126 | { |
128 | 127 | $tpl_data['SEQ_DISPLAY'] = join('<br />', $fields_data); |
129 | 128 | } |
@@ -34,7 +34,7 @@ |
||
34 | 34 | * @param \phpbb\user $user User object |
35 | 35 | * @param string $phpbb_root_path Path to the phpbb includes directory. |
36 | 36 | * @param string $php_ext php file extension |
37 | - */ |
|
37 | + */ |
|
38 | 38 | public function __construct(\phpbb\auth\auth $auth, \phpbb\config\db $config, \phpbb\user $user, $phpbb_root_path, $php_ext) |
39 | 39 | { |
40 | 40 | $this->auth = $auth; |
@@ -88,7 +88,7 @@ |
||
88 | 88 | |
89 | 89 | return new \Twig_Source($source, $name); |
90 | 90 | } |
91 | - */ |
|
91 | + */ |
|
92 | 92 | |
93 | 93 | /** |
94 | 94 | * Twig_ExistsLoaderInterface as of Twig 1.11 |
@@ -138,8 +138,7 @@ |
||
138 | 138 | { |
139 | 139 | $data = $this->blocks_data[$id]; |
140 | 140 | $column_name = 'block_tpl'; |
141 | - } |
|
142 | - else |
|
141 | + } else |
|
143 | 142 | { |
144 | 143 | $data = $this->content_types[$id]; |
145 | 144 | $column_name = $view . '_tpl'; |
@@ -44,7 +44,7 @@ |
||
44 | 44 | * @param \blitze\sitemaker\services\forum\manager $forum_manager Forum manager object |
45 | 45 | * @param \blitze\content\model\mapper_factory $cmapper_factory Content Mapper factory object |
46 | 46 | * @param \blitze\sitemaker\model\mapper_factory $smapper_factory Sitemaker Mapper factory object |
47 | - */ |
|
47 | + */ |
|
48 | 48 | public function __construct(\phpbb\cache\service $cache, \phpbb\language\language $language, \phpbb\request\request_interface $request, \blitze\content\services\types $content_types, \blitze\sitemaker\services\forum\manager $forum_manager, \blitze\content\model\mapper_factory $cmapper_factory, \blitze\sitemaker\model\mapper_factory $smapper_factory) |
49 | 49 | { |
50 | 50 | $this->cache = $cache; |
@@ -28,7 +28,7 @@ |
||
28 | 28 | * @param \phpbb\cache\service $cache Cache object |
29 | 29 | * @param \blitze\content\services\types $content_types Content types object |
30 | 30 | * @param \blitze\content\model\mapper_factory $mapper_factory Mapper factory object |
31 | - */ |
|
31 | + */ |
|
32 | 32 | public function __construct(\phpbb\cache\service $cache, \blitze\content\services\types $content_types, \blitze\content\model\mapper_factory $mapper_factory) |
33 | 33 | { |
34 | 34 | $this->cache = $cache; |
@@ -32,7 +32,7 @@ |
||
32 | 32 | * @param \phpbb\language\language $language Language Object |
33 | 33 | * @param \phpbb\template\template $template Template object |
34 | 34 | * @param \blitze\content\services\types $content_types Content types object |
35 | - */ |
|
35 | + */ |
|
36 | 36 | public function __construct(\phpbb\config\db $config, \phpbb\language\language $language, \phpbb\template\template $template, \blitze\content\services\types $content_types) |
37 | 37 | { |
38 | 38 | $this->config = $config; |