@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | * @param string $handle |
71 | 71 | * @return void |
72 | 72 | */ |
73 | - public function display_navlist(array $data, \phpbb\template\twig\twig &$template, $handle = 'tree') |
|
73 | + public function display_navlist(array $data, \phpbb\template\twig\twig & $template, $handle = 'tree') |
|
74 | 74 | { |
75 | 75 | $this->prepare_items($data); |
76 | 76 | |
@@ -84,10 +84,10 @@ discard block |
||
84 | 84 | $row['num_kids'] = $this->count_descendants($row); |
85 | 85 | |
86 | 86 | $template->assign_block_vars($handle, array_change_key_case($row, CASE_UPPER)); |
87 | - $this->close_open_tags($template, $handle . '.close', abs($prev_depth - $this_depth)); |
|
87 | + $this->close_open_tags($template, $handle.'.close', abs($prev_depth - $this_depth)); |
|
88 | 88 | } |
89 | 89 | |
90 | - $this->close_open_tags($template, 'close_' . $handle, ($this_depth - $this->min_depth)); |
|
90 | + $this->close_open_tags($template, 'close_'.$handle, ($this_depth - $this->min_depth)); |
|
91 | 91 | } |
92 | 92 | } |
93 | 93 | |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | } |
127 | 127 | |
128 | 128 | $is_current_item = $this->is_current_item($row); |
129 | - $this_depth = $this->parental_depth[$row['parent_id']] + 1; |
|
129 | + $this_depth = $this->parental_depth[$row['parent_id']] + 1; |
|
130 | 130 | $leaf = $this->get_leaf_node($row, $is_current_item); |
131 | 131 | |
132 | 132 | $this->parental_depth[$row[$this->pk]] = $this_depth; |
@@ -155,8 +155,8 @@ discard block |
||
155 | 155 | */ |
156 | 156 | protected function set_current_item(array $data) |
157 | 157 | { |
158 | - $curr_page = '/' . ltrim($this->user->page['page_dir'] . '/' . $this->user->page['page_name'], './'); |
|
159 | - $curr_page = str_replace('/index.' . $this->php_ext, '/', $curr_page); |
|
158 | + $curr_page = '/'.ltrim($this->user->page['page_dir'].'/'.$this->user->page['page_name'], './'); |
|
159 | + $curr_page = str_replace('/index.'.$this->php_ext, '/', $curr_page); |
|
160 | 160 | $curr_parts = explode('&', $this->user->page['query_string']); |
161 | 161 | |
162 | 162 | $data = array_values($data); |
@@ -239,7 +239,7 @@ discard block |
||
239 | 239 | * @param int $repeat |
240 | 240 | * @return void |
241 | 241 | */ |
242 | - protected function close_open_tags(\phpbb\template\twig\twig &$template, $handle, $repeat) |
|
242 | + protected function close_open_tags(\phpbb\template\twig\twig & $template, $handle, $repeat) |
|
243 | 243 | { |
244 | 244 | for ($i = 0; $i < $repeat; $i++) |
245 | 245 | { |
@@ -124,7 +124,7 @@ |
||
124 | 124 | { |
125 | 125 | $row['is_navigable'] = $this->is_navigable($row); |
126 | 126 | $row['is_expandable'] = ($row['is_navigable'] && !$row['item_target']) ? true : false; |
127 | - $row['url_path'] = str_replace('/index.' . $this->php_ext, '/', $row['url_path']); |
|
127 | + $row['url_path'] = str_replace('/index.'.$this->php_ext, '/', $row['url_path']); |
|
128 | 128 | } |
129 | 129 | |
130 | 130 | /** |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | |
69 | 69 | $edit_mode = $this->toggle_edit_mode(); |
70 | 70 | $style_id = $this->get_style_id(); |
71 | - $current_route = ltrim($this->user->page['page_dir'] . '/' . $this->user->page['page_name'], './'); |
|
71 | + $current_route = ltrim($this->user->page['page_dir'].'/'.$this->user->page['page_name'], './'); |
|
72 | 72 | $route_info = $blocks->get_route_info($current_route, $this->user->page['page_dir'], $style_id, $edit_mode); |
73 | 73 | |
74 | 74 | $display_modes = $this->get_display_modes($route_info['is_sub_route']); |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | */ |
115 | 115 | protected function toggle_edit_mode() |
116 | 116 | { |
117 | - $edit_mode = $this->request->variable($this->config['cookie_name'] . '_sm_edit_mode', false, false, \phpbb\request\request_interface::COOKIE); |
|
117 | + $edit_mode = $this->request->variable($this->config['cookie_name'].'_sm_edit_mode', false, false, \phpbb\request\request_interface::COOKIE); |
|
118 | 118 | |
119 | 119 | if ($this->request->is_set('edit_mode')) |
120 | 120 | { |
@@ -170,7 +170,7 @@ discard block |
||
170 | 170 | ); |
171 | 171 | } |
172 | 172 | |
173 | - $u_edit_mode = append_sid(generate_board_url() . '/' . ltrim(rtrim(build_url(array('edit_mode', 'sid', 'style')), '?'), './../'), 'edit_mode=' . (int) !$edit_mode); |
|
173 | + $u_edit_mode = append_sid(generate_board_url().'/'.ltrim(rtrim(build_url(array('edit_mode', 'sid', 'style')), '?'), './../'), 'edit_mode='.(int) !$edit_mode); |
|
174 | 174 | } |
175 | 175 | else |
176 | 176 | { |
@@ -232,7 +232,7 @@ |
||
232 | 232 | if ($page_dir) |
233 | 233 | { |
234 | 234 | $is_sub_route = true; |
235 | - $parent_route = ltrim(dirname($page_dir) . '/index.php', './'); |
|
235 | + $parent_route = ltrim(dirname($page_dir).'/index.php', './'); |
|
236 | 236 | } |
237 | 237 | else |
238 | 238 | { |
@@ -50,8 +50,7 @@ discard block |
||
50 | 50 | if (!empty($collection)) |
51 | 51 | { |
52 | 52 | return $collection->get_entities(); |
53 | - } |
|
54 | - else |
|
53 | + } else |
|
55 | 54 | { |
56 | 55 | return array(); |
57 | 56 | } |
@@ -88,8 +87,7 @@ discard block |
||
88 | 87 | if (!$has_blocks && !$hiding_blocks && !sizeof($ex_positions)) |
89 | 88 | { |
90 | 89 | $this->route_mapper->delete($route); |
91 | - } |
|
92 | - else |
|
90 | + } else |
|
93 | 91 | { |
94 | 92 | $route->set_has_blocks($has_blocks); |
95 | 93 | $this->route_mapper->save($route); |