@@ -237,8 +237,7 @@ |
||
| 237 | 237 | { |
| 238 | 238 | $padding .= $pad_with; |
| 239 | 239 | $padding_store[$row['parent_id']] = $padding; |
| 240 | - } |
|
| 241 | - else if ($row['left_id'] > $right + 1) |
|
| 240 | + } else if ($row['left_id'] > $right + 1) |
|
| 242 | 241 | { |
| 243 | 242 | $padding = (isset($padding_store[$row['parent_id']])) ? $padding_store[$row['parent_id']] : ''; |
| 244 | 243 | } |
@@ -260,8 +260,7 @@ |
||
| 260 | 260 | 'depth' => $new_parent['depth'] + 1, |
| 261 | 261 | 'right_id' => --$new_parent['right_id'], |
| 262 | 262 | ); |
| 263 | - } |
|
| 264 | - else |
|
| 263 | + } else |
|
| 265 | 264 | { |
| 266 | 265 | return array( |
| 267 | 266 | 'depth' => 0, |
@@ -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); |
@@ -135,8 +135,7 @@ discard block |
||
| 135 | 135 | if ($this->request->is_set('style')) |
| 136 | 136 | { |
| 137 | 137 | return $this->request->variable('style', 0); |
| 138 | - } |
|
| 139 | - else |
|
| 138 | + } else |
|
| 140 | 139 | { |
| 141 | 140 | return (!$this->config['override_user_style']) ? $this->user->data['user_style'] : $this->config['default_style']; |
| 142 | 141 | } |
@@ -172,8 +171,7 @@ discard block |
||
| 172 | 171 | self::SHOW_BLOCK_LANDING => true, |
| 173 | 172 | self::SHOW_BLOCK_SUBPAGE => false, |
| 174 | 173 | ); |
| 175 | - } |
|
| 176 | - else |
|
| 174 | + } else |
|
| 177 | 175 | { |
| 178 | 176 | $modes = array( |
| 179 | 177 | self::SHOW_BLOCK_BOTH => true, |
@@ -200,8 +198,7 @@ discard block |
||
| 200 | 198 | } |
| 201 | 199 | |
| 202 | 200 | $u_edit_mode = append_sid(generate_board_url() . '/' . ltrim(rtrim(build_url(array('edit_mode', 'style')), '?'), './../'), 'edit_mode=' . (($edit_mode) ? 0 : 1)); |
| 203 | - } |
|
| 204 | - else |
|
| 201 | + } else |
|
| 205 | 202 | { |
| 206 | 203 | $edit_mode = false; |
| 207 | 204 | } |
@@ -405,8 +405,7 @@ |
||
| 405 | 405 | if (is_array($title)) |
| 406 | 406 | { |
| 407 | 407 | $this->_add_lang_vars($title); |
| 408 | - } |
|
| 409 | - else if (!isset($this->user->lang[$title])) |
|
| 408 | + } else if (!isset($this->user->lang[$title])) |
|
| 410 | 409 | { |
| 411 | 410 | $this->user->lang[$title] = $title; |
| 412 | 411 | } |
@@ -22,8 +22,7 @@ |
||
| 22 | 22 | if (!extension_loaded('curl') && $curl) |
| 23 | 23 | { |
| 24 | 24 | $headers = $this->curl_header($url); |
| 25 | - } |
|
| 26 | - else |
|
| 25 | + } else |
|
| 27 | 26 | { |
| 28 | 27 | $headers = get_headers($url); |
| 29 | 28 | $headers = $headers[0]; |
@@ -104,8 +104,7 @@ discard block |
||
| 104 | 104 | if (isset($all_routes[$style_id][$current_route])) |
| 105 | 105 | { |
| 106 | 106 | return $all_routes[$style_id][$current_route]; |
| 107 | - } |
|
| 108 | - else |
|
| 107 | + } else |
|
| 109 | 108 | { |
| 110 | 109 | return $this->_get_default_route_info($all_routes, $current_route, $style_id, $edit_mode); |
| 111 | 110 | } |
@@ -226,8 +225,7 @@ discard block |
||
| 226 | 225 | if (!empty($block['content'])) |
| 227 | 226 | { |
| 228 | 227 | $content = $block['content']; |
| 229 | - } |
|
| 230 | - else if ($edit_mode) |
|
| 228 | + } else if ($edit_mode) |
|
| 231 | 229 | { |
| 232 | 230 | $content = $this->user->lang('BLOCK_NO_DATA'); |
| 233 | 231 | } |
@@ -560,8 +560,7 @@ |
||
| 560 | 560 | if ($this->_can_track_by_lastread()) |
| 561 | 561 | { |
| 562 | 562 | $info = $this->_build_tracking_info('get_topic_tracking'); |
| 563 | - } |
|
| 564 | - else if ($this->_can_track_anonymous()) |
|
| 563 | + } else if ($this->_can_track_anonymous()) |
|
| 565 | 564 | { |
| 566 | 565 | $info = $this->_build_tracking_info('get_complete_topic_tracking'); |
| 567 | 566 | } |
@@ -164,8 +164,7 @@ |
||
| 164 | 164 | if (!is_array($settings)) |
| 165 | 165 | { |
| 166 | 166 | $this->settings = $settings; |
| 167 | - } |
|
| 168 | - else if (sizeof($settings)) |
|
| 167 | + } else if (sizeof($settings)) |
|
| 169 | 168 | { |
| 170 | 169 | $this->settings = serialize($settings); |
| 171 | 170 | $this->hash = md5($this->settings); |