| @@ -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, | 
| @@ -41,8 +41,7 @@ | ||
| 41 | 41 | if (is_array($message)) | 
| 42 | 42 |  		{ | 
| 43 | 43 | $this->message = (string) $message[0]; | 
| 44 | - } | |
| 45 | - else | |
| 44 | + } else | |
| 46 | 45 |  		{ | 
| 47 | 46 | $this->message = $message; | 
| 48 | 47 | } | 
| @@ -40,8 +40,7 @@ | ||
| 40 | 40 | if ($this->can_track_by_lastread()) | 
| 41 | 41 |  		{ | 
| 42 | 42 |  			$info = $this->build_tracking_info('get_topic_tracking', $forums, $topics); | 
| 43 | - } | |
| 44 | - else if ($this->can_track_anonymous()) | |
| 43 | + } else if ($this->can_track_anonymous()) | |
| 45 | 44 |  		{ | 
| 46 | 45 |  			$info = $this->build_tracking_info('get_complete_topic_tracking', $forums, $topics); | 
| 47 | 46 | } | 
| @@ -177,13 +177,11 @@ | ||
| 177 | 177 |  		{ | 
| 178 | 178 | $route = ltrim(dirname($page_dir) . '/index.php', './'); | 
| 179 | 179 | $parent_route = $this->get_parent_route_info($routes, $route); | 
| 180 | - } | |
| 181 | - else if ($current_route === 'viewtopic.' . $this->php_ext) | |
| 180 | + } else if ($current_route === 'viewtopic.' . $this->php_ext) | |
| 182 | 181 |  		{ | 
| 183 | 182 | $route = 'viewforum.' . $this->php_ext; | 
| 184 | 183 | $parent_route = $this->get_parent_route_info($routes, $route); | 
| 185 | - } | |
| 186 | - else | |
| 184 | + } else | |
| 187 | 185 |  		{ | 
| 188 | 186 | $parent_route = $this->get_virtual_parent($routes, $current_route); | 
| 189 | 187 | } | 
| @@ -43,8 +43,7 @@ | ||
| 43 | 43 |  			if ('get' == $match[1]) | 
| 44 | 44 |  			{ | 
| 45 | 45 | return $this->$attribute; | 
| 46 | - } | |
| 47 | - else | |
| 46 | + } else | |
| 48 | 47 |  			{ | 
| 49 | 48 | $this->$attribute = $this->validate_attribute($match[2], $args[0]); | 
| 50 | 49 | return $this; | 
| @@ -104,8 +104,7 @@ | ||
| 104 | 104 | if (!isset($key)) | 
| 105 | 105 |  			{ | 
| 106 | 106 | $this->entities[] = $entity; | 
| 107 | - } | |
| 108 | - else | |
| 107 | + } else | |
| 109 | 108 |  			{ | 
| 110 | 109 | $this->entities[$key] = $entity; | 
| 111 | 110 | } | 
| @@ -96,8 +96,7 @@ | ||
| 96 | 96 | if ($entity->get_item_id()) | 
| 97 | 97 |  		{ | 
| 98 | 98 | $item = $this->tree->update_item($entity->get_item_id(), $sql_data); | 
| 99 | - } | |
| 100 | - else | |
| 99 | + } else | |
| 101 | 100 |  		{ | 
| 102 | 101 | $item = $this->tree->insert($sql_data); | 
| 103 | 102 | } | 
| @@ -175,8 +175,7 @@ | ||
| 175 | 175 | if (!is_array($settings)) | 
| 176 | 176 |  		{ | 
| 177 | 177 | $this->settings = $settings; | 
| 178 | - } | |
| 179 | - else if (sizeof($settings)) | |
| 178 | + } else if (sizeof($settings)) | |
| 180 | 179 |  		{ | 
| 181 | 180 | $this->settings = json_encode($settings); | 
| 182 | 181 | $this->hash = md5($this->settings); | 
| @@ -89,8 +89,7 @@ discard block | ||
| 89 | 89 | if (is_null($entity->$accessor())) | 
| 90 | 90 |  		{ | 
| 91 | 91 | $entity = $this->insert($entity); | 
| 92 | - } | |
| 93 | - else | |
| 92 | + } else | |
| 94 | 93 |  		{ | 
| 95 | 94 | $this->update($entity); | 
| 96 | 95 | } | 
| @@ -109,8 +108,7 @@ discard block | ||
| 109 | 108 |  			{ | 
| 110 | 109 | $accessor = 'get_' . $this->entity_pkey; | 
| 111 | 110 | $condition = array($this->entity_pkey, '=', $condition->$accessor()); | 
| 112 | - } | |
| 113 | - else | |
| 111 | + } else | |
| 114 | 112 |  			{ | 
| 115 | 113 |  				throw new \blitze\sitemaker\exception\invalid_argument(array('entity', 'INVALID_ENTITY')); | 
| 116 | 114 | } |